Match upstream standards.texi.

* doc/standards.texi: Resync from upstream.
* doc/fdl-1.3.texi: Rename...
* doc/fdl.texi: ...to this.
* doc/Makefile.am (autoconf_TEXINFOS, standards_TEXINFOS): Update
users.
* doc/autoconf.texi (GNU Free Documentation License): Likewise.
* cfg.mk (fetch): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 8a06cbf3484ea960b8d21d1a209cbd1924c6b097..2367c7c7e8e26b270229c827149ed088a0787fa3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-11-10  Eric Blake  <ebb9@byu.net>
 
+       Match upstream standards.texi.
+       * doc/standards.texi: Resync from upstream.
+       * doc/fdl-1.3.texi: Rename...
+       * doc/fdl.texi: ...to this.
+       * doc/Makefile.am (autoconf_TEXINFOS, standards_TEXINFOS): Update
+       users.
+       * doc/autoconf.texi (GNU Free Documentation License): Likewise.
+       * cfg.mk (fetch): Likewise.
+
        Yet more FDL 1.3 fallout.
        * NEWS: Mention manual license change.
 

diff --git a/cfg.mk b/cfg.mk
index 8e7901bba1330836369911047580f1b759dd63a9..2d6ce99978421d32d258b0f377e3365adc17aa3d 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -56,7 +56,7 @@ fetch:
        cp $(gnulib_dir)/build-aux/missing $(srcdir)/build-aux
        cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
        cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
-       cp $(gnulib_dir)/doc/fdl-1.3.texi $(srcdir)/doc
+       cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/gnu-oids.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/make-stds.texi $(srcdir)/doc
        cp $(gnulib_dir)/doc/standards.texi $(srcdir)/doc

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4f510610535bb92776de5eeaf093e70b5ba95efe..38abc5ffe8110fd3d2d7d4a5d88fcdaf4c399a44 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,8 +21,8 @@ TEXI2HTML_FLAGS = -split_chapter
 TEXINFO_TEX = ../build-aux/texinfo.tex
 
 info_TEXINFOS = autoconf.texi standards.texi
-autoconf_TEXINFOS = fdl-1.3.texi install.texi
-standards_TEXINFOS = fdl-1.3.texi gnu-oids.texi make-stds.texi
+autoconf_TEXINFOS = fdl.texi install.texi
+standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi
 
 # Files from texi2dvi that should be removed, but which Automake does
 # not know.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index fbb0a3b1e86ec66ed4fca48d8417323adc463b28..34611b803567c8a5c79eb1c3e5a6fd9fa42ef94e 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -22559,7 +22559,7 @@ have free time again.  I think.  Yeah, right.)
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 
-@include fdl-1.3.texi
+@include fdl.texi
 
 @node Indices
 @appendix Indices

diff --git a/doc/fdl-1.3.texi b/doc/fdl.texi
similarity index 100%
rename from doc/fdl-1.3.texi
rename to doc/fdl.texi

diff --git a/doc/standards.texi b/doc/standards.texi
index 97d25d137fbce022bd6a6dd2b5cd8f525213b230..bd90a92df8f1faa8311e4a491d1653f1c74513d6 100644 (file)
--- 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:
-@set lastupdate November 10, 2008
+@set lastupdate November 6, 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
-@include fdl-1.3.texi
+@include fdl.texi
 
 @node Index
 @unnumbered Index