# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1286584631 25200
# Node ID 3d97b0ab637b94922c48dc95fab566f46b5b8bbf
# Parent  7e091be752b1ebe74d3686b75209d99c42e9f2ea
* doc/man/emacs.1: Update license description.

diff -r 7e091be752b1 -r 3d97b0ab637b doc/man/ChangeLog
--- a/doc/man/ChangeLog	Fri Oct 08 13:40:23 2010 +0200
+++ b/doc/man/ChangeLog	Fri Oct 08 17:37:11 2010 -0700
@@ -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 -r 7e091be752b1 -r 3d97b0ab637b doc/man/emacs.1
--- a/doc/man/emacs.1	Fri Oct 08 13:40:23 2010 +0200
+++ b/doc/man/emacs.1	Fri Oct 08 17:37:11 2010 -0700
@@ -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 .