Re: gnulib.texi license

[Simon Josefsson]

address@hidden (Karl Berry) writes:

>     The honour goes back to you: 
>
> In that case, please go ahead, Simon, but please also change 200X-200Y
> to 2004-2008.

I have pushed the patch below.

/Simon

>From c231865128c6a323e87cbf0ba904a2078f21faf7 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Sun, 26 Oct 2008 09:38:56 +0100
Subject: [PATCH] Use GFDLv1.2+ for manual.

---
 ChangeLog             |    5 +++++
 doc/gnulib-intro.texi |    9 +++++----
 doc/gnulib.texi       |    8 ++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8cea4bb..d8cc5c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-26  Simon Josefsson  <address@hidden>
 
+       * doc/gnulib.texi (@copying): Use GFDLv1.2+.
+       * doc/gnulib-intro.texi (Copyright): Likewise.
+
+2008-10-26  Simon Josefsson  <address@hidden>
+
        * doc/gnulib.texi (Header files): C++ fixes, based on Bruno's
        findings.
 
diff --git a/doc/gnulib-intro.texi b/doc/gnulib-intro.texi
index 527fad5..29b918f 100644
--- a/doc/gnulib-intro.texi
+++ b/doc/gnulib-intro.texi
@@ -250,12 +250,13 @@ not a problem, since compiled tests are not installed by 
``make install''.
 Documentation files are under this copyright:
 
 @quotation
-Copyright @copyright{} 200X-200Y Free Software Foundation, address@hidden
+Copyright @copyright{} 2004-2008 Free Software Foundation, address@hidden
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 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.
+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''.
 @end quotation
 @end table
 
diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index 1d9cf60..3548852 100644
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -22,11 +22,11 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free 
Software
 Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 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
-``GNU Free Documentation License.''
+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''.
 @end copying
 
 @dircategory Software development
-- 
1.5.6.5