[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111052: * doc/misc/erc.texi: No need to include gpl in this small manual.

[Glenn Morris]

------------------------------------------------------------
revno: 111052
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-21 10:14:29 -0800
message:
  * doc/misc/erc.texi: No need to include gpl in this small manual.
modified:
  doc/misc/ChangeLog
  doc/misc/erc.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-12-14 17:14:49 +0000
+++ b/doc/misc/ChangeLog        2012-12-21 18:14:29 +0000
@@ -1,3 +1,7 @@
+2012-12-21  Glenn Morris  <address@hidden>
+
+       * erc.texi: No need to include gpl in this small manual.
+
 2012-12-14  Glenn Morris  <address@hidden>
 
        * org.texi (copying): Include a copy of the GFDL.

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/erc.texi 2012-12-21 18:14:29 +0000
@@ -62,10 +62,6 @@
 * Advanced Usage::              Cool ways of using ERC.
 * Getting Help and Reporting Bugs::
 * History::                     The history of ERC.
-* Copying::                     The GNU General Public License gives you
-                                  permission to redistribute ERC on
-                                  certain terms; it also explains that
-                                  there is no warranty.
 * GNU Free Documentation License::  The license for this documentation.
 * Concept Index::               Search for terms.
 
@@ -855,10 +851,6 @@
 
 @end itemize
 
address@hidden Copying
address@hidden GNU GENERAL PUBLIC LICENSE
address@hidden gpl.texi
-
 @node GNU Free Documentation License
 @appendix GNU Free Documentation License
 @include doclicense.texi