Re: fdl-1.3

[Eric Blake]

Karl Berry <karl <at> freefriends.org> writes:

> 
>     > Subject: [PATCH] Add GFDLv1.3.
>     Will standards.texi be swapped to use this new license?
> 
> I presume so, but I should ask rms.

Karl, I see with your latest autoupdate[1] that upstream standards.texi now 
claims to use FDL 1.3, but still @includes fdl.texi (FDL 1.2).  I'm pushing 
this to gnulib, but you'll need to mirror it back upstream; either that, or we 
rename:

fdl.texi => fdl-1.2.texi
fdl-1.3.texi => fdl.texi

[1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=c939df3

From: Eric Blake <address@hidden>
Date: Mon, 10 Nov 2008 10:58:36 -0700
Subject: [PATCH] standards.texi: include correct file for FDL 1.3

* doc/standards.texi (GNU Free Documentation License): Change
include file to pull in FDL 1.3, not 1.2.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    4 ++++
 doc/standards.texi |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a81aa77..5f36de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-11-10  Eric Blake  <address@hidden>
 
+       standards.texi: include correct file for FDL 1.3
+       * doc/standards.texi (GNU Free Documentation License): Change
+       include file to pull in FDL 1.3, not 1.2.
+
        fdl.texi: revert accidental change to license
        * doc/fdl.texi: This is FDL 1.2, not 1.3.
 
diff --git a/doc/standards.texi b/doc/standards.texi
index bd90a92..97d25d1 100644
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -3,7 +3,7 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
address@hidden lastupdate November 6, 2008
address@hidden lastupdate November 10, 2008
 @c %**end of header
 
 @dircategory GNU organization
@@ -4196,7 +4196,7 @@ is not an objection against it.
 @appendix GNU Free Documentation License
 
 @cindex FDL, GNU Free Documentation License
address@hidden fdl.texi
address@hidden fdl-1.3.texi
 
 @node Index
 @unnumbered Index
-- 
1.6.0.2