* doc/man/emacs.1: Update license description.

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 3bee2a1011ab5cec78c113e705e80770f672d0b1..a2c8cd4913410dca1631824061d4be5729bcc671 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-09  Ulrich Mueller  <ulm@gentoo.org>
+
+       * emacs.1: Update license description.
+
 2010-08-26  Sven Joachim  <svenjoac@gmx.de>
 
        * emacs.1: Mention "maximized" value for the "fullscreen" X resource.

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index b192514eadfa82b653f5337ddd2e864f1fa53f05..d8885704c36fd2fdffcafb45e9ea77aa23f0eddb 100644 (file)
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -596,10 +596,7 @@ file /usr/local/share/emacs/$VERSION/etc/MAILINGLISTS.
 .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 @@ may sometimes be received packaged with distributions of Unix systems,
 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 .