[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-222-gba74efb

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=ba74efba1a408e89a87cfe34f2e939036954e7e4

The branch, master has been updated
       via  ba74efba1a408e89a87cfe34f2e939036954e7e4 (commit)
      from  bc41f1c27a24e1eab9a036356cf3c529c35882f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba74efba1a408e89a87cfe34f2e939036954e7e4
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Nov 10 22:27:14 2008 +0100

    Update to GFDL 1.3.
    
    * doc/fdl.texi: Update to GFDL 1.3.
    * doc/automake.texi (GNU Free Documentation License): Adjust.
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    5 +++
 NEWS              |    2 +
 doc/automake.texi |    4 ++-
 doc/fdl.texi      |   90 ++++++++++++++++++++++++++++++++++++++++++----------
 4 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e0ab39..f1d8b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-11-10  Ralf Wildenhues  <address@hidden>
 
+       Update to GFDL 1.3.
+       * doc/fdl.texi: Update to GFDL 1.3.
+       * doc/automake.texi (GNU Free Documentation License): Adjust.
+       * NEWS: Update.
+
        * NEWS: Fix typos.
        * automake.in: Fix typos in comments.  Remove extraneous
        whitespace.
diff --git a/NEWS b/NEWS
index 57fd45f..2bcb448 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,8 @@ New in 1.10a:
     Note that Automake will never overwrite an existing COPYING file,
     even when the `--force-missing' option is used.
 
+  - The manual is now distributed under the terms of the GNU FDL 1.3.
+
   - Automake ships and installs man pages for automake and aclocal now.
 
   - New shorthand `$(pkglibexecdir)' for `$(libexecdir)/@PACKAGE@'.
diff --git a/doc/automake.texi b/doc/automake.texi
index 40b5b5d..e9aebc8 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -27,7 +27,7 @@ Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 
2001, 2002,
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the @acronym{GNU} Free Documentation License,
-Version 1.2 or any later version published by the Free Software
+Version 1.3 or any later version published by the Free Software
 Foundation; with no Invariant Sections, with no Front-Cover texts,
 and with no Back-Cover Texts.  A copy of the license is included in the
 section entitled address@hidden Free Documentation License.''
@@ -12198,6 +12198,8 @@ parentheses is the number of generated test cases.
 * GNU Free Documentation License::  License for copying this manual
 @end menu
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
 @include fdl.texi
 
 @page
diff --git a/doc/fdl.texi b/doc/fdl.texi
index fe78df8..8805f1a 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,13 +1,12 @@
address@hidden The GNU Free Documentation License.
address@hidden Version 1.3, 3 November 2008
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
-
address@hidden FDL, GNU Free Documentation License
address@hidden Version 1.2, November 2002
address@hidden This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.
 
 @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.
address@hidden://fsf.org/}
 
 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 ``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
@@ -380,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
@@ -404,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.
+
address@hidden
+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
address@hidden ADDENDUM: How to use this License for your documents
address@hidden 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
@@ -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
-  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
@@ -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,
-replace the ``with...Texts.'' line with this:
+replace the address@hidden'' line with this:
 
 @smallexample
 @group


hooks/post-receive
--
GNU Automake