Update FDL to version 1.3.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5d5067ae315a4da35aa6f6d6d4ac6c7b3943e06b..cc6f2aa9148e403f70b0fe6cb4badec3f4e8156f 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-04  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi, fdl.texi: Updated to FDL version 1.3.
+

 2008-10-31  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Mailing List): Update info to reflect change to
 2008-10-31  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Mailing List): Update info to reflect change to

diff --git a/doc/fdl.texi b/doc/fdl.texi
index 9c6d9afe3f60868ee1503c21c700d558c4068fd7..8805f1a47d95e35dd768a735ccf9ec951ba29f06 100644 (file)
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,13 +1,12 @@
+@c The GNU Free Documentation License.
+@center Version 1.3, 3 November 2008

 
 

-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
-@center Version 1.2, November 2002
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.

 
 @display
 
 @display

-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, 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.
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.


@@ -112,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 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
 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


@@ -380,13 +382,30 @@ title.
 @item
 TERMINATION
 
 @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
 
 @item
 FUTURE REVISIONS OF THIS LICENSE


@@ -404,7 +423,42 @@ 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
 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
 @end enumerate
 
 @page


@@ -418,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
 @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
   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


@@ -427,7 +481,7 @@ license notices just after the title page:
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
 @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
 
 @smallexample
 @group

diff --git a/doc/wget.texi b/doc/wget.texi
index b0891c0a4e7365fd55df54f5e4c4e2eaef6a5153..470bea75e091f9063e5a77dbe1e738261805162b 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -4038,6 +4038,10 @@ subscribers of the Wget mailing list.
 * GNU Free Documentation License::  Licnse for copying this manual.
 @end menu
 
 * GNU Free Documentation License::  Licnse for copying this manual.
 @end menu
 

+@node GNU Free Documentation License
+@appendixsec GNU Free Documentation License
+@cindex FDL, GNU Free Documentation License
+

 @include fdl.texi
 
 
 @include fdl.texi