site: switch to Haunt.

TODO:
- make a news page that gathers news.
- remove other filters and move previously filtered files to the static dir.
- handle unreviewd articles

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

Move site/software/gnuboot/web/static to static.

In both cases (before and now) we have the index.html that is not
copied where it should but the code is cleaner.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

install index.html in site/software/gnuboot/

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

.gitignore

@@ -27,11 +27,12 @@
 /release/
 /resources/coreboot/*/seen
 /seabios/
+/site/news/index*
+/site/sitemap.md
 /tmp/
 /version
 /versiondate
-/website/pages/news/index*
+/website/site/**
-/website/pages/sitemap.md
 Makefile
 Makefile.in
 aclocal.m4
@@ -41,3 +42,4 @@ config.status
 configure
 install-sh
 missing
+/web/

resources/packages/website/download

@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-. resources/scripts/misc/sysexits.sh
-
-progname="resources/packages/website/download"
-
-set -e
-
-usage()
-{
-    progname="$1"
-
-    printf "Usage: %s [options]\n\n" "${progname}"
-    printf "Available options:\n"
-    printf "\t-h, --help\n"
-    printf "\t\tDisplay this help and exit.\n"
-}
-
-download_untitled()
-{
-    cd website
-    ./autogen.sh
-    ./configure --disable-guix --disable-lighttpd
-    ./build.sh --download-only
-}
-
-if [ $# -eq 1 ] && { [ "$1" = "-h" ] || [ "$1" == "--help" ] ;} ; then
-    usage "${progname}"
-    exit 0
-elif [ $# -eq 0 ] ; then
-    download_untitled
-else
-    usage "${progname}"
-    exit ${EX_USAGE}
-fi

resources/packages/website/release

@@ -34,7 +34,7 @@ build_website()
 {
     version="$(git --no-pager describe --tags HEAD)"
 
-    cd website
+    cd website-build
     ./autogen.sh
     ./configure --disable-guix --disable-lighttpd
     make website.tar.gz
@@ -42,9 +42,6 @@ build_website()
     # Release website source and transformed files
     install -d ../release
     install -m 644 website.tar.gz ../release/gnuboot-website-"${version}".tar.gz
-
-    # Relase untitled source code
-    git -C untitled bundle create ../../release/untitled-"${version}".bundle HEAD
 }
 
 if [ $# -eq 1 ] && { [ "$1" = "-h" ] || [ "$1" == "--help" ] ;} ; then

website/.gitignore

@@ -1,6 +1,5 @@
-/autom4te.cache/
-/untitled/
 /aclocal.m4
+/autom4te.cache/
 /config.log
 /config.status
 /configure
@@ -10,5 +9,5 @@
 /Makefile
 /Makefile.in
 /missing
-/website.tar.gz
 /site/**
+/website.tar.gz

website/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2022-2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+# Copyright (C) 2022-2024 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,73 +16,35 @@
 
 all: help
 
-BUILD_OPTIONS :=
-GUIX_SHARE_OPTIONS := --share=`realpath ../`
-
-if WANT_UNTITLED_PATH
-BUILD_OPTIONS += --with-untitled-path $(UNTITLED_PATH)
-GUIX_SHARE_OPTIONS += --share=`realpath $(UNTITLED_PATH)`
-endif
-
-index.html: index.html.tmpl
-	sed -e "s#WEBSITE_PREFIX#$(WEBSITE_PREFIX)#g" "$^" > "$@"
-
-site.cfg: site.cfg.tmpl
-	sed -e "s#WEBSITE_PREFIX#$(WEBSITE_PREFIX)#g" "$^" > "$@"
-
 if WANT_GUIX
-build: site.cfg
+build:
 	guix time-machine \
-	--commit=c15a1cd88f80a90437f4b0159f22dfc84b9e6851 \
+	--commit=v1.4.0 \
 	-- shell \
-		--container \
+		haunt
-		--network \
-		--emulate-fhs \
-		$(GUIX_SHARE_OPTIONS) \
-		bash \
-		coreutils \
-		findutils \
-		git \
-		grep \
-		nss-certs \
-		pandoc \
-		sed \
 		-- \
-		./build.sh $(BUILD_OPTIONS)
+		haunt build
 else
-build: site.cfg
+build:
-		./build.sh $(BUILD_OPTIONS)
+		haunt build
 endif
 
 if WANT_GUIX
-check: build website.tar.gz index.html
+check: website.tar.gz
-	rm -rf site/
-	mkdir -p site/$(WEBSITE_PREFIX)
-	tar xf website.tar.gz -C site/$(WEBSITE_PREFIX)
-
 	guix shell \
 		--container \
 		--network \
 		--emulate-fhs \
 		bash \
 		coreutils \
-		findutils \
 		grep \
 		gzip \
-		sed \
 		tar \
 		-- \
-		./check.sh --website-prefix $(WEBSITE_PREFIX) \
+		./check.sh --tarball website.tar.gz
-			--directory site && \
-		./check.sh  --website-prefix $(WEBSITE_PREFIX) \
-			--tarball website.tar.gz
 else
-check: build website.tar.gz index.html
+check: website.tar.gz
-	rm -rf site/
+		./check.sh --tarball website.tar.gz
-	mkdir -p site/$(WEBSITE_PREFIX)
-	tar xf website.tar.gz -C site/$(WEBSITE_PREFIX)
-	./check.sh --website-prefix $(WEBSITE_PREFIX) --directory site
-	./check.sh --website-prefix $(WEBSITE_PREFIX) --tarball website.tar.gz
 endif
 
 help:
@@ -91,34 +53,30 @@ help:
 		"help           # Print this help" \
 		"build          # Build the website" \
 		"serve          # run lighttpd on localhost:$(LIGHTTPD_PORT)" \
-		"publish        # Publish the website to https://gnu.org/$(WEBSITE_PREFIX)" \
+		"publish        # Publish the website to https://gnu.org/software/gnuboot" \
 		"check          # Run automatic tests" \
 		"website.tar.gz # Create a tarball of the website"
 
 if WANT_GUIX
-serve: website.tar.gz
+serve: build
 	guix shell \
 		--container \
 		--network \
 		--emulate-fhs \
 		bash \
 		coreutils \
-		gzip \
 		lighttpd \
 		sed \
-		tar \
 		-- \
-		./serve.sh --website-prefix $(WEBSITE_PREFIX) \
+		./serve.sh $(LIGHTTPD_PORT)
-			website.tar.gz $(LIGHTTPD_PORT)
 else
 if WANT_LIGHTTPD
-serve: website.tar.gz
+serve: build
-		./serve.sh --website-prefix $(WEBSITE_PREFIX) \
+		./serve.sh $(LIGHTTPD_PORT)
-			website.tar.gz $(LIGHTTPD_PORT)
 else
 serve:
 	@printf "%s %s\n" \
-		"The test target is disabled." \
+		"The serve target is disabled." \
 		"To enable it, run './configure --enable-lighttpd'."
 	@false
 endif
@@ -137,7 +95,7 @@ publish: website.tar.gz
 		deploy/ \
 		$(RSYNC_DESTINATION)/
 
-website.tar.gz: build index.html
+website.tar.gz: build
 	tar \
 		--exclude-vcs \
 		--format=gnu \
@@ -145,6 +103,4 @@ website.tar.gz: build index.html
 		--sort=name \
 		-czf \
 		website.tar.gz \
-		untitled/www/lbwww/site \
+		site
-		index.html \
-		--transform="s#untitled/www/lbwww/site#web#"

website/haunt.scm

@@ -0,0 +1,41 @@
+;;; Copyright © 2015 David Thompson <davet@gnu.org>
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;;
+;;; This file is based on haunt/builder/blog.scm,
+;;; haunt/reader/commonmark.scm and tests/post.scm and from Haunt
+;;; 2.6.0.
+;;;
+;;; Haunt is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; Haunt is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Haunt.  If not, see <http://www.gnu.org/licenses/>.
+
+(use-modules (haunt builder assets)
+             (haunt site)
+             (website builders gnuboot)
+             (website readers untitled))
+
+(site #:title "GNU Boot"
+      #:domain "gnu.org/software/gnuboot"
+      #:default-metadata
+      '((author . "GNU Boot contributors"))
+      #:file-filter untitled-file-filter
+      #:posts-directory "pages"
+      #:readers (list untitled-reader)
+      #:builders (list (gnuboot-website
+			#:prefix "software/gnuboot/web")
+		       (static-directory "html"
+					 "software/gnuboot/")
+                       (static-directory "hwdumps"
+                                         "software/gnuboot/docs/hardware/")
+                       (static-directory "static"
+					 "software/gnuboot/web/")))

website/html/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Refresh" content="0; url='https://gnu.org/WEBSITE_PREFIX/web/'" />
+    <meta http-equiv="Refresh" content="0; url='https://gnu.org/software/gnuboot/web/'" />
   </head>
 </html>

website/pages/global.css

@@ -1,21 +1,7 @@
-.warning_banner {
-	background:#000000;
-	color:#ffffff;
-	margin:0 auto;
-	font-family:sans-serif;
-	line-height:5
-}
-
 html{
 	background:#fff;
 	color:#222;
 }
-
-table, th, td {
-	border: solid;
-	border-collapse: collapse;
-}
-
 .date,.author,.h a{display:none}
 code,pre,#TOC,a:hover{background:#eee}
 :not(p),a:hover {

website/pages/news/MANIFEST

@@ -1,27 +1,27 @@
-gnuboot-december-2023.md
+gnuboot-december-2023.html
-translations.md
+translations.html
-libreboot20211122.md
+libreboot20211122.html
-libreboot20210522.md
+libreboot20210522.html
-libreboot20160907.md
+libreboot20160907.html
-libreboot20160902.md
+libreboot20160902.html
-libreboot20160818.md
+libreboot20160818.html
-libreboot20150518.md
+libreboot20150518.html
-libreboot20150208.md
+libreboot20150208.html
-libreboot20150126.md
+libreboot20150126.html
-libreboot20150124.md
+libreboot20150124.html
-libreboot20141015.md
+libreboot20141015.html
-libreboot20140911.md
+libreboot20140911.html
-libreboot20140903.md
+libreboot20140903.html
-libreboot20140811.md
+libreboot20140811.html
-libreboot20140729.md
+libreboot20140729.html
-libreboot20140720.md
+libreboot20140720.html
-libreboot20140716.md
+libreboot20140716.html
-libreboot20140711.md
+libreboot20140711.html
-libreboot20140622.md
+libreboot20140622.html
-libreboot20140611.md
+libreboot20140611.html
-libreboot20140605.md
+libreboot20140605.html
-libreboot20140309.md
+libreboot20140309.html
-libreboot20140221.md
+libreboot20140221.html
-libreboot20131214.md
+libreboot20131214.html
-libreboot20131213.md
+libreboot20131213.html
-libreboot20131212.md
+libreboot20131212.html

website/serve.sh

@@ -18,30 +18,26 @@ set -e
 
 usage()
 {
-	progname="$1"
+	echo "$0 [PORT]"
-
-	echo "${progname} --website-prefix PREFIX <path/to/tarball> [PORT]"
 	exit 1
 }
 
-if [ $# -ne 3 ] && [ $# -ne 4 ] && [ "$1" != "--website-prefix" ] ; then
+if [ $# -ne 0 ] && [ $# -ne 1 ] ; then
-	usage "serve.sh"
+	usage
 fi
 
 basedir="$(dirname $(realpath $0))"
 
-prefix="$2"
-tarball="$3"
-
 lighttpd_port=8086
-if [ $# -eq 2 ] ; then
+if [ $# -eq 1 ] ; then
-    lighttpd_port="$4"
+    lighttpd_port="$1"
 fi
 
 mkdir -p "site/${prefix}"
 tar xf "${tarball}" -C "site/${prefix}"
 
 sed -e "s#LIGHTTPD_PORT#${lighttpd_port}#g" \
+    -e "s#LIGHTTPD_PORT#${lighttpd_port}#g" \
     "${basedir}/lighttpd.conf.tmpl" > \
     "${basedir}/lighttpd.conf"
 

website/site.cfg.tmpl

@@ -1,4 +0,0 @@
-TITLE="GNU Boot"
-CSS="/WEBSITE_PREFIX/web/global.css"
-DOMAIN="https://gnu.org/WEBSITE_PREFIX/web/"
-BLOGDIR="news/"

website/static/gnuboot.css

@@ -0,0 +1,34 @@
+html{
+	background:#fff;
+	color:#222;
+}
+.date,.author,.h a{display:none}
+code,pre,#TOC,a:hover{background:#eee}
+:not(p),a:hover {
+	max-width:60em;
+	margin:0 auto;
+	font-family:sans-serif;
+	line-height:1.4
+}
+a{color:#22d}
+.title>*, header ul>li, .nav ul>li,
+#footer ul>li, .h:hover>*
+			   ul>li
+{
+	display:inline;
+	margin:.7%;
+	text-align:center;
+}
+.title>*,span.date{display:block}
+img,video,iframe{max-width:100%}
+#TOC{
+	float:left;
+	margin:1em
+}
+html,ul,#TOC{padding:1em}
+@media (min-width:60em) {
+	.title-logo{display:none}
+	div.title {background-position:right}
+	h1.title {padding:0 4em}
+	#TOC{min-width:25%}
+}

website/static/img/COPYING

@@ -0,0 +1,451 @@
+
+                GNU Free Documentation License
+                 Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+     <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.  See
+https://www.gnu.org/licenses/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 
+license published by Creative Commons Corporation, a not-for-profit 
+corporation with a principal place of business in San Francisco, 
+California, as well as future copyleft versions of that license 
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in 
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this 
+License, and if all works that were first published under this License 
+somewhere other than this MMC, and subsequently incorporated in whole or 
+in part into the MMC, (1) had no cover texts or invariant sections, and 
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.