doclicense.texi: Update to latest version from FSF

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b6d0f88..0077a9c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * doclicense.texi: Update to latest version from FSF.
+       This is just minor editorial changes.
+

 2012-10-24  Paul Eggert  <eggert@penguin.cs.ucla.edu>
 
        Update manual for new time stamp format (Bug#12706).
 2012-10-24  Paul Eggert  <eggert@penguin.cs.ucla.edu>
 
        Update manual for new time stamp format (Bug#12706).

diff --git a/texi/doclicense.texi b/texi/doclicense.texi
index a511ffc..cb71f05 100644 (file)
--- a/texi/doclicense.texi
+++ b/texi/doclicense.texi
@@ -1,4 +1,3 @@
-@c -*-texinfo-*-

 @c The GNU Free Documentation License.
 @center Version 1.3, 3 November 2008
 
 @c The GNU Free Documentation License.
 @center Version 1.3, 3 November 2008
 


@@ -6,7 +5,7 @@
 @c hence no sectioning command or @node.
 
 @display
 @c hence no sectioning command or @node.
 
 @display

-Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.

 @uref{http://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies
 @uref{http://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies


@@ -93,16 +92,16 @@ An image format is not Transparent if used for any substantial amount
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain

-@sc{ascii} without markup, Texinfo input format, La@TeX{} input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
+ASCII without markup, Texinfo input format, La@TeX{} input
+format, SGML or XML using a publicly available
+DTD, and standard-conforming simple HTML,
+PostScript or PDF designed for human modification.  Examples
+of transparent image formats include PNG, XCF and
+JPG.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, SGML or
+XML for which the DTD and/or processing tools are
+not generally available, and the machine-generated HTML,
+PostScript or PDF produced by some word processors for

 output purposes only.
 
 The ``Title Page'' means, for a printed book, the title page itself,
 output purposes only.
 
 The ``Title Page'' means, for a printed book, the title page itself,


@@ -482,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@dots{}Texts.'' line with this:
+replace the ``with@dots{}Texts.''@: line with this:

 
 @smallexample
 @group
 
 @smallexample
 @group


@@ -501,7 +500,6 @@ recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.
 
 free software license, such as the GNU General Public License,
 to permit their use in free software.
 

-

 @c Local Variables:
 @c ispell-local-pdict: "ispell-dict"
 @c End:
 @c Local Variables:
 @c ispell-local-pdict: "ispell-dict"
 @c End: