procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ulrich Mueller 2010-10-08 17:37:11 -07:00 • committed by Glenn Morris
parent 2e828c79a3
commit a653652edc
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/man/ChangeLog
View file

@ -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.

7
doc/man/emacs.1
View file

@ -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 .