summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-12-21 10:14:29 -0800
committerGlenn Morris <rgm@gnu.org>2012-12-21 10:14:29 -0800
commit08953d7f7a9e92b7b62da8c126ca801a76d19a31 (patch)
tree4fa211e1f03f5e3b3505cbf2797995df14424c42 /doc
parentbb085aed959358d9f13d568f87507347832beae5 (diff)
downloademacs-08953d7f7a9e92b7b62da8c126ca801a76d19a31.tar.gz
* doc/misc/erc.texi: No need to include gpl in this small manual.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/erc.texi8
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9e6090f13ff..d442def8f89 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-21 Glenn Morris <rgm@gnu.org>
+
+ * erc.texi: No need to include gpl in this small manual.
+
2012-12-14 Glenn Morris <rgm@gnu.org>
* org.texi (copying): Include a copy of the GFDL.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 7b8b9176848..ec3abf5557b 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -62,10 +62,6 @@ and modified without restriction.
* 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 @@ is maintained as part of Emacs.
@end itemize
-@node Copying
-@appendix GNU GENERAL PUBLIC LICENSE
-@include gpl.texi
-
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi