aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/erc.texi
diff options
context:
space:
mode:
authorGlenn Morris2011-02-19 11:40:59 -0800
committerGlenn Morris2011-02-19 11:40:59 -0800
commit67ab0163d67fbfeb41c37c8a259f27eeef965520 (patch)
tree0baa678a486744cc30719841ab745fe690f5bc9d /doc/misc/erc.texi
parentd6e96966e86d8eadec446788d19144bd69b1e798 (diff)
parent27ac6e7908c1d7b503ac5dca42a34ab9068d0864 (diff)
downloademacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.tar.gz
emacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.zip
Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca
Diffstat (limited to 'doc/misc/erc.texi')
-rw-r--r--doc/misc/erc.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 1ce6e949da5..463a14f08d2 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -28,7 +28,7 @@ and modified without restriction.
28@end quotation 28@end quotation
29@end copying 29@end copying
30 30
31@dircategory Emacs 31@dircategory Emacs network features
32@direntry 32@direntry
33* ERC: (erc). Powerful and extensible IRC client for Emacs. 33* ERC: (erc). Powerful and extensible IRC client for Emacs.
34@end direntry 34@end direntry