[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100094: * doc/man/emacs.1: Update license description.

[Glenn Morris]

------------------------------------------------------------
revno: 100094
author: Ulrich Mueller <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-10-08 17:37:11 -0700
message:
  * doc/man/emacs.1: Update license description.
modified:
  doc/man/ChangeLog
  doc/man/emacs.1

=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2010-08-26 15:14:55 +0000
+++ b/doc/man/ChangeLog 2010-10-09 00:37:11 +0000
@@ -1,3 +1,7 @@
+2010-10-09  Ulrich Mueller  <address@hidden>
+
+       * emacs.1: Update license description.
+
 2010-08-26  Sven Joachim  <address@hidden>
 
        * emacs.1: Mention "maximized" value for the "fullscreen" X resource.

=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1   2010-08-26 15:14:55 +0000
+++ b/doc/man/emacs.1   2010-10-09 00:37:11 +0000
@@ -596,10 +596,7 @@
 .I Emacs
 is free; anyone may redistribute copies of
 .I Emacs
-to
-anyone under the terms stated in the
-.I Emacs
-General Public License,
+to anyone under the terms stated in the GNU General Public License,
 a copy of which accompanies each copy of
 .I Emacs
 and which also
@@ -611,7 +608,7 @@
 but it is never included in the scope of any license covering those
 systems.
 Such inclusion violates the terms on which distribution is permitted.
-In fact, the primary purpose of the General Public License is to
+In fact, the primary purpose of the GNU General Public License is to
 prohibit anyone from attaching any other restrictions to
 redistribution of
 .IR Emacs .