From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Wed, 03 Sep 2014 14:30:21 -0400 Subject: Merge libreboot-6b6. Conflicts: buildrom-withgrub --- (limited to 'docs/license.html') diff --git a/docs/license.html b/docs/license.html deleted file mode 100644 index 3b5f415..0000000 --- a/docs/license.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - Copyright licensing information for the libreboot project (http://www.libreboot.org/) documentation - - - - - - -

Copyright licensing information for the libreboot project (http://www.libreboot.org/) documentation

- -

- Libreboot documentation (included in the 'docs' directory) and this license document are:
- Copyright © 2014 Francis Rowe, All Rights Reserved.
- Send email to info@gluglug.org.uk for your enquiry. -

- -

- I (Francis Rowe) give license (except where otherwise noted) to you (the licensee or "end user") for the supplied documentation in the 'docs' directory, -- with exception to this license document that you are reading now which may only be read, copied and distributed without modification -- under your chosen parallel (simultaneous) combination of AT LEAST ONE (1) of, or singular selection from AT LEAST ONE (1) of or parallel (simultaneous) choice of ALL THREE (3) of the following copyright licenses: -

- -

- Creative Commons Attribution-ShareAlike 4.0 International public license (per cc-by-sa-4.txt) - or (at your choosing) any subsequent version of the Creative Commons Attribution-ShareAlike International public license - (per https://creativecommons.org/licenses/) - as published by Creative Commons. -
- GNU Free Documentation License, version 1.3 with no Invariant Sections, no Front-Cover Texts and no Back-Cover Texts (per gnu-fdl-1.3.shtml) - or (at your choosing) any subsequent version of the GNU Free Documentation License with no Invariant Sections, no Front-Cover Texts and no Back-Cover Texts (per https://www.gnu.org/licenses/) as published by the Free Software Foundation. -
- GNU General Public License, version 3.0 (per gnu-gpl-3.0.shtml) or (at your option) any subsequent version - of the GNU General Public License (per https://www.gnu.org/licenses/) as published by the Free Software Foundation. Per Section 7b of the GNU General Public License version 3.0 (per gnu-gpl-3.0.shtml) you must also comply with the Attribution section below: -

- -

Attribution

Credit Francis Rowe,
Provide the title of the work,
Provide the URL where the work is made available,
Indicate the type of license it is available under and provide a copy of the license (so others can find out the license terms); and
Keep intact any copyright notices associated with the work.

- -

- Exceptions -

- -

- I (Francis Rowe) do not claim copyright ownership (due to lack of copyright ownership) on the following license documents located within the 'docs' directory: -

cc-by-sa-4.txt (attributed to Creative Commons)
gnu-fdl-1.3.shtml (attributed to the Free Software Foundation)
gnu-gpl-3.0.shtml (attributed to the Free Software Foundation)

- - - -- cgit v0.9.1