[Emacs-diffs] /srv/bzr/emacs/trunk r111003: * doclicense.texi, gpl.texi: Update to latest version from FSF.

[Paul Eggert]

------------------------------------------------------------
revno: 111003
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-24 13:37:18 -0800
message:
  * doclicense.texi, gpl.texi: Update to latest version from FSF.
  
  These are just minor editorial changes.
modified:
  doc/emacs/ChangeLog
  doc/emacs/doclicense.texi
  doc/emacs/gpl.texi
  doc/lispintro/ChangeLog
  doc/lispintro/doclicense.texi
  doc/lispref/ChangeLog
  doc/lispref/doclicense.texi
  doc/lispref/elisp.texi
  doc/lispref/gpl.texi
  doc/misc/ChangeLog
  doc/misc/doclicense.texi
  doc/misc/gpl.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-11-21 04:47:55 +0000
+++ b/doc/emacs/ChangeLog       2012-11-24 21:37:18 +0000
@@ -1,3 +1,8 @@
+2012-11-24  Paul Eggert  <address@hidden>
+
+       * doclicense.texi, gpl.texi: Update to latest version from FSF.
+       These are just minor editorial changes.
+
 2012-11-21  Dani Moncayo  <address@hidden>
 
        * display.texi (Auto Scrolling): Fix some inaccuracies, plus

=== modified file 'doc/emacs/doclicense.texi'
--- a/doc/emacs/doclicense.texi 2011-01-15 23:16:57 +0000
+++ b/doc/emacs/doclicense.texi 2012-11-24 21:37:18 +0000
@@ -1,4 +1,3 @@
address@hidden -*-texinfo-*-
 @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
-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
@@ -93,16 +92,16 @@
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
address@hidden without markup, Texinfo input format, address@hidden input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
address@hidden, 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
address@hidden  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
address@hidden 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, address@hidden 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,
@@ -482,7 +481,7 @@
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the address@hidden'' line with this:
+replace the address@hidden''@: line with this:
 
 @smallexample
 @group
@@ -501,8 +500,6 @@
 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:
-

=== modified file 'doc/emacs/gpl.texi'
--- a/doc/emacs/gpl.texi        2011-01-15 23:16:57 +0000
+++ b/doc/emacs/gpl.texi        2012-11-24 21:37:18 +0000
@@ -2,7 +2,7 @@
 @center Version 3, 29 June 2007
 
 @c This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.  
address@hidden hence no sectioning command or @node.
 
 @display
 Copyright @copyright{} 2007 Free Software Foundation, Inc. 
@url{http://fsf.org/}
@@ -222,7 +222,7 @@
 conditions:
 
 @enumerate a
address@hidden 
address@hidden
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -670,7 +670,7 @@
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
address@hidden line to give the program's name and a brief idea of what it 
does.}  
address@hidden line to give the program's name and a brief idea of what it 
does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -693,7 +693,7 @@
 notice like this when it starts in an interactive mode:
 
 @smallexample
address@hidden Copyright (C) @var{year} @var{name of author} 
address@hidden Copyright (C) @var{year} @var{name of author}
 This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type @samp{show c} for details.

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2012-10-24 05:12:23 +0000
+++ b/doc/lispintro/ChangeLog   2012-11-24 21:37:18 +0000
@@ -1,3 +1,8 @@
+2012-11-24  Paul Eggert  <address@hidden>
+
+       * doclicense.texi: Update to latest version from FSF.
+       These are just minor editorial changes.
+
 2012-10-24  Paul Eggert  <address@hidden>
 
        * emacs-lisp-intro.texi (Files List):

=== modified file 'doc/lispintro/doclicense.texi'
--- a/doc/lispintro/doclicense.texi     2011-01-15 23:16:57 +0000
+++ b/doc/lispintro/doclicense.texi     2012-11-24 21:37:18 +0000
@@ -1,4 +1,3 @@
address@hidden -*-texinfo-*-
 @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
-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
@@ -93,16 +92,16 @@
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
address@hidden without markup, Texinfo input format, address@hidden input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
address@hidden, 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
address@hidden  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
address@hidden 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, address@hidden 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,
@@ -482,7 +481,7 @@
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the address@hidden'' line with this:
+replace the address@hidden''@: line with this:
 
 @smallexample
 @group
@@ -501,8 +500,6 @@
 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:
-

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-11-24 06:50:44 +0000
+++ b/doc/lispref/ChangeLog     2012-11-24 21:37:18 +0000
@@ -1,5 +1,11 @@
 2012-11-24  Paul Eggert  <address@hidden>
 
+       * doclicense.texi: Update to latest version from FSF.
+       These are just minor editorial changes.
+       * elisp.texi (GNU Free Documentation License)
+       (GNU General Public Licens):
+       Provide sectioning, since doclicense.texi no longer does that.
+
        * loading.texi (Named Features): @ -> @@ to fix typo.
 
 2012-11-24  Martin Rudalics  <address@hidden>

=== modified file 'doc/lispref/doclicense.texi'
--- a/doc/lispref/doclicense.texi       2012-05-27 01:34:14 +0000
+++ b/doc/lispref/doclicense.texi       2012-11-24 21:37:18 +0000
@@ -1,15 +1,11 @@
address@hidden -*-texinfo-*-
 @c The GNU Free Documentation License.
address@hidden GNU Free Documentation License
-
address@hidden GNU Free Documentation License
 @center Version 1.3, 3 November 2008
 
 @c This file is intended to be included within another document,
 @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
@@ -96,16 +92,16 @@
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
address@hidden without markup, Texinfo input format, address@hidden input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
address@hidden, 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
address@hidden  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
address@hidden 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, address@hidden 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,
@@ -485,7 +481,7 @@
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the address@hidden'' line with this:
+replace the address@hidden''@: line with this:
 
 @smallexample
 @group
@@ -504,7 +500,6 @@
 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:

=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi    2012-11-20 08:02:54 +0000
+++ b/doc/lispref/elisp.texi    2012-11-24 21:37:18 +0000
@@ -1588,7 +1588,11 @@
 @c appendices
 
 @include anti.texi
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
 @include doclicense.texi
address@hidden GPL
address@hidden GNU General Public License
 @include gpl.texi
 @include tips.texi
 @include internals.texi

=== modified file 'doc/lispref/gpl.texi'
--- a/doc/lispref/gpl.texi      2012-05-27 01:34:14 +0000
+++ b/doc/lispref/gpl.texi      2012-11-24 21:37:18 +0000
@@ -1,12 +1,8 @@
address@hidden -*-texinfo-*-
-
address@hidden GPL
address@hidden GNU General Public License
 @c The GNU General Public License.
 @center Version 3, 29 June 2007
 
 @c This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.  
address@hidden hence no sectioning command or @node.
 
 @display
 Copyright @copyright{} 2007 Free Software Foundation, Inc. 
@url{http://fsf.org/}
@@ -226,7 +222,7 @@
 conditions:
 
 @enumerate a
address@hidden 
address@hidden
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -674,7 +670,7 @@
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
address@hidden line to give the program's name and a brief idea of what it 
does.}  
address@hidden line to give the program's name and a brief idea of what it 
does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -697,7 +693,7 @@
 notice like this when it starts in an interactive mode:
 
 @smallexample
address@hidden Copyright (C) @var{year} @var{name of author} 
address@hidden Copyright (C) @var{year} @var{name of author}
 This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type @samp{show c} for details.

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-11-23 18:43:29 +0000
+++ b/doc/misc/ChangeLog        2012-11-24 21:37:18 +0000
@@ -1,3 +1,8 @@
+2012-11-24  Paul Eggert  <address@hidden>
+
+       * doclicense.texi, gpl.texi: Update to latest version from FSF.
+       These are just minor editorial changes.
+
 2012-11-23  Jay Belanger  <address@hidden>
 
        * calc.texi (Date Formatting Codes): Mention the new beginning of

=== modified file 'doc/misc/doclicense.texi'
--- a/doc/misc/doclicense.texi  2010-09-02 00:55:51 +0000
+++ b/doc/misc/doclicense.texi  2012-11-24 21:37:18 +0000
@@ -1,4 +1,3 @@
address@hidden -*-texinfo-*-
 @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
-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
@@ -93,16 +92,16 @@
 of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
address@hidden without markup, Texinfo input format, address@hidden input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
address@hidden, 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
address@hidden  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
address@hidden 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, address@hidden 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,
@@ -482,7 +481,7 @@
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the address@hidden'' line with this:
+replace the address@hidden''@: line with this:
 
 @smallexample
 @group
@@ -501,7 +500,6 @@
 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:

=== modified file 'doc/misc/gpl.texi'
--- a/doc/misc/gpl.texi 2011-01-15 23:16:57 +0000
+++ b/doc/misc/gpl.texi 2012-11-24 21:37:18 +0000
@@ -2,7 +2,7 @@
 @center Version 3, 29 June 2007
 
 @c This file is intended to be included within another document,
address@hidden hence no sectioning command or @node.  
address@hidden hence no sectioning command or @node.
 
 @display
 Copyright @copyright{} 2007 Free Software Foundation, Inc. 
@url{http://fsf.org/}
@@ -222,7 +222,7 @@
 conditions:
 
 @enumerate a
address@hidden 
address@hidden
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -670,7 +670,7 @@
 the ``copyright'' line and a pointer to where the full notice is found.
 
 @smallexample
address@hidden line to give the program's name and a brief idea of what it 
does.}  
address@hidden line to give the program's name and a brief idea of what it 
does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -693,7 +693,7 @@
 notice like this when it starts in an interactive mode:
 
 @smallexample
address@hidden Copyright (C) @var{year} @var{name of author} 
address@hidden Copyright (C) @var{year} @var{name of author}
 This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
 This is free software, and you are welcome to redistribute it
 under certain conditions; type @samp{show c} for details.