3 files changed, 15 insertions, 83 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index ea10c5fe781..7bb09689bbd 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 bd2b5fd66c2..fc7be71f284 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.
diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1
deleted file mode 100644
index a3635a61838..00000000000
--- a/doc/man/grep-changelog.1
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" -*- nroff -*-
-.\" See section COPYING for copyright and redistribution information.
-.TH grep-changelog 1
-.SH NAME
-grep-changelog \- print ChangeLog entries matching criteria
-.SH SYNOPSIS
-.B grep-changelog
-.RI [ options ]
-.RI [ CHANGELOG .\|.\|.]
-.SH DESCRIPTION
-.B grep-changelog
-searches the named
-.IR CHANGELOG s
-(by default files matching the regular expressions
-.B ChangeLog
-and
-.BR "ChangeLog\e.[0-9]+" )
-for entries matching the specified criteria.  At least one option or
-file must be specified.  This program is distributed with
-.BR "GNU Emacs" .
-.PP
-.SH OPTIONS
-The program accepts unambiguous abbreviations for option names.
-.TP
-.B \-\-author=AUTHOR
-Print entries whose author matches regular expression
-.IR AUTHOR .
-.TP
-.B \-\-text=TEXT
-Print entries whose text matches regular expression
-.IR TEXT .
-.TP
-.B \-\-exclude=TEXT
-Exclude entries matching regular expression
-.IR TEXT .
-.TP
-.B \-\-from\-date=YYYY\-MM\-DD
-Only consider entries made on or after the given date.
-ChangeLog date entries not in the
-\*(lqYYYY\-MM\-DD\*(rq format are never matched.
-.TP
-.B \-\-to\-date=YYYY\-MM\-DD
-Only consider entries made on or before the given date.
-.TP
-.B \-\-rcs\-log
-Print output in a format suitable for RCS log entries.
-This format removes author lines, leading spaces, and file names.
-.TP
-.B \-\-with\-date
-In RCS log format, print short dates.
-.TP
-.B \-\-reverse
-Show matches in reverse order.
-.TP
-.B \-\-version
-Display version information.
-.TP
-.B \-\-help
-Display basic usage information.
-.
-.SH COPYING
-Copyright 
-.if t \(co
-.if n (C)
-2008-2014 Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-.