aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-10-26 19:33:32 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2009-10-26 19:33:32 +0200
commitfd2468864b719af4cfb0266b1bb8c6b0dbd53aa0 (patch)
treec1473eff168c9f99ce0bd4dbe5f506c4381b2649 /doc
parent31a646d592e09918a801e86274eb1b97bf4541d2 (diff)
downloadpies-fd2468864b719af4cfb0266b1bb8c6b0dbd53aa0.tar.gz
pies-fd2468864b719af4cfb0266b1bb8c6b0dbd53aa0.tar.bz2
Minor changes
* doc/Config (EXTRA_HEAD, AFTER_BODY_OPEN): Use qq{} to quote contents. * doc/fdl.texi: Upgrade to v.1.3. * doc/pies.texi: Likewise.
Diffstat (limited to 'doc')
-rw-r--r--doc/Config28
-rw-r--r--doc/fdl.texi91
-rw-r--r--doc/pies.texi2
3 files changed, 89 insertions, 32 deletions
diff --git a/doc/Config b/doc/Config
index 45c39b1..fefdffe 100644
--- a/doc/Config
+++ b/doc/Config
@@ -30,20 +30,20 @@ $SEPARATED_FOOTNOTES = 0;
$BODYTEXT = "";
-$EXTRA_HEAD="\
- <link rev=\"made\" href=\"mailto:gray@gnu.org.ua\">\
- <link rel=\"stylesheet\" type=\"text/css\" href=\"${top_html_dir}/gray.css\">\
- <link rel=\"stylesheet\" type=\"text/css\" href=\"${top_html_dir}/texi.css\">\
- <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-icon.png\">";
-
-$AFTER_BODY_OPEN="\
-<!--#include virtual=\"${top_html_dir}/inc/header.html\" -->\
-<ul class=\"tabs\">\
- <li><a href=\"/software/pies/pies.html\">Main</a></li>\
- <li><a href=\"/software/pies/example.html\">Examples</a></li>\
- <li><a href=\"/software/pies/download.html\">Downloads</a></li>\
- <li><a class=\"active\" href=\"/software/pies/manual.html\">Documentation</a></li>\
-</ul>";
+$EXTRA_HEAD=qq{
+ <link rev="made" href="mailto:gray@gnu.org.ua">
+ <link rel="stylesheet" type="text/css" href="${top_html_dir}/gray.css">
+ <link rel="stylesheet" type="text/css" href="${top_html_dir}/texi.css">
+ <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png">};
+
+$AFTER_BODY_OPEN=qq{
+<!--#include virtual="${top_html_dir}/inc/header.html" -->
+<ul class="tabs">
+ <li><a href="${top_html_dir}/pies.html">Main</a></li>
+ <li><a href="${top_html_dir}/example.html">Examples</a></li>
+ <li><a href="${top_html_dir}/download.html">Downloads</a></li>
+ <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li>
+</ul>};
$PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.";
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 7da8738..8805f1a 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,10 +1,12 @@
-@setfilename fdl.info
-@cindex FDL, GNU Free Documentation License
-@center Version 1.2, November 2002
+@c The GNU Free Documentation License.
+@center Version 1.3, 3 November 2008
+
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -109,6 +111,9 @@ 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
@@ -341,7 +346,7 @@ 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 an aggregate, this License does not
+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.
@@ -377,13 +382,30 @@ title.
@item
TERMINATION
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License. Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License. However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
+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.
@item
FUTURE REVISIONS OF THIS LICENSE
@@ -401,11 +423,46 @@ 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.
+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.
+
+@item
+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.
+
@end enumerate
@page
-@appendixsec ADDENDUM: How to use this License for your documents
+@heading 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
@@ -415,7 +472,7 @@ license notices just after the title page:
@group
Copyright (C) @var{year} @var{your name}.
Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
+ 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
@@ -424,7 +481,7 @@ license notices just after the title page:
@end smallexample
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
+replace the ``with@dots{}Texts.'' line with this:
@smallexample
@group
diff --git a/doc/pies.texi b/doc/pies.texi
index d780e6d..9db612b 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -44,7 +44,7 @@ Boston, MA 02110-1301 USA
Copyright @copyright{} 2005, 2006, 2007, 2008, 2009 Sergey Poznyakoff
Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+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, with the Front-Cover texts being ``GNU Pies Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license

Return to:

Send suggestions and report system problems to the System administrator.