4 files changed, 19 insertions, 71 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 98b04de4177..ec117affda2 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,15 +1,23 @@
-2010-12-29  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
+2011-01-02  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
 
 	* emacsclient.1: Arrange options alphabetically (Bug#7620).
 
-2010-10-10  Glenn Morris  <rgm@gnu.org>
+2010-10-12  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.1: Small fixes.
 
-2010-10-09  Ulrich Mueller  <ulm@gentoo.org>
+2010-10-12  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs.1: Update license description.
 
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+	* b2m.1: Remove file.
+
+2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
+
+	* etags.1: xz compression is now supported.
+
 2010-08-26  Sven Joachim  <svenjoac@gmx.de>
 
 	* emacs.1: Mention "maximized" value for the "fullscreen" X resource.
@@ -18,10 +26,14 @@
 
 	* Version 23.2 released.
 
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
-	* emacs.1: Copyedits.  Update options -Q, -mm and --daemon.  Remove
-	deprecated --unibyte option.
+	* emacs.1: Copyedits.  Update options -Q, -mm and --daemon.
+	Remove deprecated --unibyte option.
 
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/doc/man/b2m.1 b/doc/man/b2m.1
deleted file mode 100644
index e777ec43468..00000000000
--- a/doc/man/b2m.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" See section COPYING for copyright and redistribution information.
-.TH b2m 1
-.SH NAME
-b2m \- convert old Emacs Rmail Babyl format to mbox format
-.SH SYNOPSIS
-.B b2m
-<
-.I babyl-file
->
-.I mbox-file
-.SH DESCRIPTION
-.B b2m
-accepts Babyl format mail (as used by older versions of
-.BR Rmail
-in
-.BR "GNU Emacs" )
-on standard input, and converts it to mbox format on standard output.
-Babyl was the storage format used by Rmail prior to Emacs 23.1.  Since
-then, it uses standard mbox format.  This program is distributed with
-.BR "GNU Emacs" .
-.PP
-.SH OPTIONS
-The program accepts unambiguous abbreviations for long option names.
-.TP
-.B \-V, \-\-version
-Display version information.
-.TP
-.B \-h, \-\-help
-Display basic usage information.
-.
-.SH SEE ALSO
-The Babyl format is described in the file
-.B etc/BABYL
-in the Emacs distribution.
-.B Rmail
-is documented in the GNU Emacs manual, which  you  can  read  using
-.BR Info ,
-either from Emacs or as a standalone program.
-.
-.SH AUTHORS
-.I b2m
-was originally written by Ed Wilkinson.  Francesco Potorti updated it
-according to the GNU coding standards.
-.SH COPYING
-Copyright 
-.if t \(co
-.if n (C)
-2008, 2009, 2010, 2011 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.
-.
-.\" arch-tag: 7586e605-c400-447e-82ff-4d38e3c0a37d
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 7b9eb1fd2ad..89eafc9ba51 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.91"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.50"
 .
 .
 .SH NAME
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index f00c58a034d..177809d4d74 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -62,7 +62,7 @@ Files specified with absolute file names will be recorded
 with absolute file names.  Files generated from a source file\-\-like
 a C file generated from a source Cweb file\-\-will be recorded with
 the name of the source file.
-Compressed files are supported using gzip and bzip2.
+Compressed files are supported using gzip, bzip2, and xz.
 The programs recognize the language used in an input file based on its
 file name and contents.  The \fB\-\-language\fP switch can be used to force
 parsing of the file names following the switch according to the given