Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-252
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-253
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-254
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-255
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-256
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-257
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-258
   Clean up lisp/gnus/ChangeLog a bit

 * emacs@sv.gnu.org/emacs--devo--0--patch-259
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-260
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-261
   lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t

 * emacs@sv.gnu.org/emacs--devo--0--patch-262
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-96
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-97
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-98
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554

1 files changed, 39 insertions, 9 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 1f417968fa9..bd48e3f4f20 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,16 +1,46 @@
+2006-05-01  Richard Stallman  <rms@gnu.org>
+
+        * emacs.texi (Top): Add Diff Mode to menu.
+
+2006-05-01  Aaron S. Hawley  <Aaron.Hawley@uvm.edu>
+
+        * misc.texi (Diff Mode): New node.
+
+2006-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macos.texi (Mac International): Now Carbon Emacs has ATSUI support.
+        (Mac Environment Variables): Shorten example line.
+        (Mac Font Specs): Shorten lisp lines.  Add descriptions for ATSUI.
+
+2006-05-01  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GUD Customization): Describe cases %d and %c.
+        Update description for %e.
+
+2006-04-30  Glenn Morris  <rgm@gnu.org>
+
+        * calendar.texi (LaTeX Calendar): Mention cal-tex-preamble-extra.
+
+2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * custom.texi (Examining): Update C-h v output example.
+
+2006-04-29  Kim F. Storm  <storm@cua.dk>
+
+        * building.texi (Grep Searching): Add lgrep and rgrep.
+
 2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * pgg.texi (Caching passphrase): Fix markup and typos.  Simplify.
 
 2006-04-26  Sascha Wilde  <wilde@sha-bang.de>
 
-        * pgg.texi (Caching passphrase): Added documentation for
-        pgg-gpg-use-agent.
+        * pgg.texi (Caching passphrase): Add pgg-gpg-use-agent.
 
 2006-04-24  Bill Wohler  <wohler@newt.com>
 
-        * mh-e.texi (Getting Started): Made it more explicit that you need
-        to install MH, and also included pointers to current MH implementations.
+        * mh-e.texi (Getting Started): Make it more explicit that you need
+        to install MH.  Add pointers to current MH implementations.
 
 2006-04-23  Richard Stallman  <rms@gnu.org>
 
@@ -24,14 +54,14 @@
 2006-04-21  Bill Wohler  <wohler@newt.com>
 
         Release MH-E manual version 7.94.
-        
+
         * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
         release 7.94.
 
 2006-04-21  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.texi: Many small fixes.
-        (Handling links): Renamed from "Managing links".
+        (Handling links): Rename from "Managing links".
 
 2006-04-21  Eli Zaretskii  <eliz@gnu.org>
 
@@ -57,7 +87,7 @@
 
 2006-04-20  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Time stamps): Better explanation of the purpose of
+        * org.texi (Time stamps): Better explanation of the purpose of
         different time stamps.
         (Structure editing, Plain lists): More details on how new items
         and headings are inserted.
@@ -74,7 +104,7 @@
 
 2006-04-18  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Formula syntax): Fixed link to Calc Manual.
+        * org.texi (Formula syntax): Fixed link to Calc Manual.
 
 2006-04-17  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -96,7 +126,7 @@
 
 2006-04-13  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Updating settings): New section.
+        * org.texi (Updating settings): New section.
         (Visibility cycling): Better names for the startup folding
         options.
         (Exporting): Completely restructured.