aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorMiles Bader2006-08-03 05:10:38 +0000
committerMiles Bader2006-08-03 05:10:38 +0000
commit2e3ef421a9e7888ed48241bbeecedaeefb58ab54 (patch)
treed7a59eb24269a42164aff762ed8b4c952293cdac /man
parent6b2fcbb546b8b69b2eef40c5042439d3f822bec7 (diff)
downloademacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.tar.gz
emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.zip
Merge from erc--emacs--21
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379 Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog4
-rw-r--r--man/erc.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 23788624bf9..4723b892276 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
12006-08-03 Michael Olson <mwolson@gnu.org>
2
3 * erc.texi: Update for ERC 5.1.4.
4
12006-08-01 Richard Stallman <rms@gnu.org> 52006-08-01 Richard Stallman <rms@gnu.org>
2 6
3 * help.texi (Name Help): Add index entries for describe-variable. 7 * help.texi (Name Help): Add index entries for describe-variable.
diff --git a/man/erc.texi b/man/erc.texi
index 29b0f059722..c4317f11511 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -12,7 +12,7 @@
12@syncodeindex fn cp 12@syncodeindex fn cp
13 13
14@copying 14@copying
15This manual is for ERC version 5.1.3. 15This manual is for ERC version 5.1.4.
16 16
17Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc. 17Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
18 18