summaryrefslogtreecommitdiff
path: root/doc/man
diff options
context:
space:
mode:
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/ChangeLog14
-rw-r--r--doc/man/emacs.1.in (renamed from doc/man/emacs.1)4
2 files changed, 15 insertions, 3 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 576cc097e62..205e9b900cc 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,6 +1,18 @@
+2014-12-14 Glenn Morris <rgm@gnu.org>
+
+ * grep-changelog.1: Remove file.
+
+2014-11-10 Glenn Morris <rgm@gnu.org>
+
+ * emacs.1.in: Rename from emacs.1.
+
2014-10-20 Glenn Morris <rgm@gnu.org>
- * Version 24.4 released.
+ * Merge in all changes up to 24.4 release.
+
+2014-09-29 Eli Zaretskii <eliz@gnu.org>
+
+ * emacs.1: Bump version to 25.0.50.
2014-01-12 Glenn Morris <rgm@gnu.org>
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1.in
index e68c89ff83d..259acb9bba8 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1.in
@@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.51"
+.TH EMACS 1 "2007 April 13" "GNU Emacs @version@"
.
.
.SH NAME
@@ -579,7 +579,7 @@ They are stored here to reduce the size of Emacs proper.
.
.
.SH BUGS
-There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
+There is a mailing list, @PACKAGE_BUGREPORT@, for reporting Emacs
bugs and fixes.
But before reporting something as a bug, please try to be sure that
it really is a bug, not a misunderstanding or a deliberate feature.