Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158

18 files changed, 481 insertions, 145 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 09eb469c53f..3e6fb6d8164 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,156 @@
+2006-12-31  Kim F. Storm  <storm@cua.dk>
+
+        * major.texi (Choosing Modes): Document auto-mode-case-fond.
+
+2006-12-30  Kim F. Storm  <storm@cua.dk>
+
+        * killing.texi (CUA Bindings): Fix typo.
+
+        * xresources.texi (Table of Resources): Mention grow-only value for
+        auto-resize-tool-bars.
+
+2006-12-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.55.
+
+        * trampver.texi: Update release number.
+
+2006-12-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Customizing Articles): Add index entries for all
+        gnus-treat-* variables.
+
+2006-12-29  Jouni K. Sepp,Ad(Bnen  <jks@iki.fi>
+
+        * gnus.texi (IMAP): Fix incorrect explanation of
+        nnimap-search-uids-not-since-is-evil in documentation for
+        nnimap-expunge-search-string.
+
+2006-12-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
+        spam-ifile-database.
+
+2006-12-26  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Spam Package Configuration Examples): Don't encourage to
+        rebind C-s.
+
+2006-12-26  Jouni K. Sepp,Ad(Bnen  <jks@iki.fi>
+
+        * gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
+        (Mail Group Commands, Expiring Mail, IMAP): Add index entries for
+        "expiring mail".
+        (IMAP): Document nnimap-search-uids-not-since-is-evil and
+        nnimap-nov-is-evil.
+
+2006-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows Keyboard): Mention widespread Windows bindings,
+        and how to get them back.
+
+2006-12-26  Richard Stallman  <rms@gnu.org>
+
+        * calendar.texi (Holidays): Holiday listing is based on current
+        practice, but DST is not.
+
+2006-12-25  Richard Stallman  <rms@gnu.org>
+
+        * emacs.texi (Top): Update subnode menus.
+
+        * mark.texi (Transient Mark): Fix xref.
+
+        * killing.texi (Graphical Kill): Node deleted.
+        (Killing): Add xref to Cut and Paste.
+        (CUA Bindings): Update xref.
+
+        * frames.texi (Cut and Paste): New section to hold other nodes.
+        (Mouse Commands): Node demoted.
+        (Cut/Paste Other App): Split out from Mouse Commands.
+        (Word and Line Mouse): Likewise.
+        (Secondary Selection, Clipboard): Nodes demoted.
+
+2006-12-25  Kevin Ryde  <user42@zip.com.au>
+
+        * cl.texi (Sorting Sequences): In sort*, add a little cautionary note
+        about the key procedure being used heavily.
+
+2006-12-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed
+        to t.
+        (Prerequisites): Add explanation about gpg-agent.
+
+2006-12-24  Kevin Ryde  <user42@zip.com.au>
+
+        * calendar.texi (Holidays): US daylight savings begins second Sunday
+        in March for 2007 onwards.
+        (Daylight Savings): Show new US default daylight savings rules, 2nd
+        Sun in Mar to 1st Sun in Nov, now in cal-dst.el.
+
+2006-12-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * calendar.texi (Scroll Calendar): < and > are switched.
+
+2006-12-23  Kevin Rodgers  <ihs_4664@yahoo.com>
+
+        * killing.texi (Deletion): Describe M-\ prefix argument.
+
+2006-12-23  Richard Stallman  <rms@gnu.org>
+
+        * search.texi (Regexp Search): Explain why forward and reverse regexp
+        search are not mirror images.
+
+2006-12-22  Kevin Ryde  <user42@zip.com.au>
+
+        * cl.texi (Sorting Sequences): Typo in sort*, example showed plain
+        "sort" instead of "sort*".
+
+2006-12-19  Richard Stallman  <rms@gnu.org>
+
+        * calc.texi (History and Acknowledgements): Recognize that Emacs
+        now does have floating point.
+
+2006-12-19  Kim F. Storm  <storm@cua.dk>
+
+        * major.texi (Choosing Modes): Describe match-function elements for
+        magic-mode-alist.
+
+2006-12-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (External transfer methods): Describe new method `scpc'.
+
+2006-12-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows Keyboard): Add a footnote about "Windows" keys
+        peculiarities.
+
+2006-12-18  Richard Stallman  <rms@gnu.org>
+
+        * abbrevs.texi (Editing Abbrevs): Fix previous change.
+
+2006-12-17  Sascha Wilde  <wilde@sha-bang.de>
+
+        * pgg.texi: Added short note on gpg-agent to the introduction.
+
+2006-12-17  Alan Mackenzie  <acm@muc.de>
+
+        * programs.texi (Left Margin Paren): Remove the bit which says
+        that CC Mode sets open-paren-in-column-0-is-defun-start to nil.
+        Discuss some of the issues of setting this option to nil.
+
+2006-12-17  Glenn Morris  <rgm@gnu.org>
+
+        * abbrevs.texi (Editing Abbrevs): Mention system abbrevs.
+
+2006-12-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows Keyboard): Clarify `w32-recognize-altgr' effect.
+        (Windows Files): `w32-get-true-file-attributes' is only relevant for
+        NTFS volumes.
+        (ls in Lisp): `links' in `ls-lisp-verbosity' is only relevant to NTFS
+        volumes.
+
 2006-12-15  Eli Zaretskii  <eliz@gnu.org>
 
         * text.texi (HTML Mode): Fix "C-c TAB".
diff --git a/man/abbrevs.texi b/man/abbrevs.texi
index 0283b332976..bea460a9a61 100644
--- a/man/abbrevs.texi
+++ b/man/abbrevs.texi
@@ -255,6 +255,10 @@ keeps track of this to help you see which abbrevs you actually use, so
 that you can eliminate those that you don't use often.  The string at
 the end of the line is the expansion.
 
+  Some abbrevs are marked with @samp{(sys)}.  These ``system'' abbrevs
+(@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual}) are
+pre-defined by various modes, and are not saved to your abbrev file.
+
 @findex edit-abbrevs
 @kindex C-c C-c @r{(Edit Abbrevs)}
   @kbd{M-x edit-abbrevs} allows you to add, change or kill abbrev
diff --git a/man/calc.texi b/man/calc.texi
index 6f3082fb776..d38becd46d9 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -1539,7 +1539,8 @@ To make a long story short, Emacs Lisp turned out to be a distressingly
 solid implementation of Lisp, and the humble task of calculating
 turned out to be more open-ended than one might have expected.
 
-Emacs Lisp doesn't have built-in floating point math, so it had to be
+Emacs Lisp didn't have built-in floating point math (now it does), so
+this had to be
 simulated in software.  In fact, Emacs integers will only comfortably
 fit six decimal digits or so---not enough for a decent calculator.  So
 I had to write my own high-precision integer code as well, and once I had
diff --git a/man/calendar.texi b/man/calendar.texi
index 8b66cb6113e..45aec25be9b 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -240,9 +240,9 @@ the months on it.  Scrolling the calendar means moving the strip
 horizontally, so that new months become visible in the window.
 
 @table @kbd
-@item <
-Scroll calendar one month forward (@code{scroll-calendar-left}).
 @item >
+Scroll calendar one month forward (@code{scroll-calendar-left}).
+@item <
 Scroll calendar one month backward (@code{scroll-calendar-right}).
 @item C-v
 @itemx @key{NEXT}
@@ -254,16 +254,15 @@ Scroll calendar three months backward
 (@code{scroll-calendar-right-three-months}).
 @end table
 
-@kindex < @r{(Calendar mode)}
-@findex scroll-calendar-left
 @kindex > @r{(Calendar mode)}
+@findex scroll-calendar-left
+@kindex < @r{(Calendar mode)}
 @findex scroll-calendar-right
   The most basic calendar scroll commands scroll by one month at a
 time.  This means that there are two months of overlap between the
-display before the command and the display after.  @kbd{<} scrolls
-the calendar contents one month to the left; that is, it moves the
-display forward in time.  @kbd{>} scrolls the contents to the
-right, which moves backwards in time.
+display before the command and the display after.  @kbd{>} scrolls the
+calendar contents one month forward in time.  @kbd{<} scrolls the
+contents one month backwards in time.
 
 @kindex C-v @r{(Calendar mode)}
 @findex scroll-calendar-left-three-months
@@ -527,12 +526,8 @@ categories of holidays.  You can use this command even if you don't have
 a calendar window.
 
   The dates used by Emacs for holidays are based on @emph{current
-practice}, not historical fact.  Historically, for instance, the start
-of daylight savings time and even its existence have varied from year to
-year, but present United States law mandates that daylight savings time
-begins on the first Sunday in April.  When the daylight savings rules
-are set up for the United States, Emacs always uses the present
-definition, even though it is wrong for some prior years.
+practice}, not historical fact.  For example Veteran's Day began in
+1919, but is shown in earlier years.
 
 @node Sunrise/Sunset
 @section Times of Sunrise and Sunset
@@ -1593,14 +1588,14 @@ day in the solar and lunar calculations.
   The values for Cambridge, Massachusetts are as follows:
 
 @example
-(calendar-nth-named-day 1 0 4 year)
-(calendar-nth-named-day -1 0 10 year)
+(calendar-nth-named-day 2 0 3 year)
+(calendar-nth-named-day 1 0 11 year)
 @end example
 
 @noindent
-That is, the first 0th day (Sunday) of the fourth month (April) in
-the year specified by @code{year}, and the last Sunday of the tenth month
-(October) of that year.  If daylight savings time were
+That is, the second 0th day (Sunday) of the third month (March) in
+the year specified by @code{year}, and the first Sunday of the eleventh month
+(November) of that year.  If daylight savings time were
 changed to start on October 1, you would set
 @code{calendar-daylight-savings-starts} to this:
 
diff --git a/man/cl.texi b/man/cl.texi
index 051aa18e02c..2c357f5fec6 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -4086,13 +4086,15 @@ accepts a @code{:key} argument which is used to preprocess data
 fed to the @var{predicate} function.  For example,
 
 @example
-(setq data (sort data 'string-lessp :key 'downcase))
+(setq data (sort* data 'string-lessp :key 'downcase))
 @end example
 
 @noindent
 sorts @var{data}, a sequence of strings, into increasing alphabetical
 order without regard to case.  A @code{:key} function of @code{car}
-would be useful for sorting association lists.
+would be useful for sorting association lists.  It should only be a
+simple accessor though, it's used heavily in the current
+implementation.
 
 The @code{sort*} function is destructive; it sorts lists by actually
 rearranging the @code{cdr} pointers in suitable fashion.
diff --git a/man/emacs.texi b/man/emacs.texi
index 76b77f38f8b..d8bb5e8d5dc 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.0.91
+@set EMACSVER  22.0.92
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -297,8 +297,6 @@ Killing and Moving Text
 * Killing by Lines::    How to kill entire lines of text at one time.
 * Other Kill Commands:: Commands to kill large regions of text and
                           syntactic units such as words and sentences.
-* Graphical Kill::      The kill ring on graphical displays:
-                          yanking between applications.
 * CUA Bindings::        Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy
                           and paste, with enhanced rectangle support.
 
@@ -441,9 +439,7 @@ Multiple Windows
 
 Frames and X Windows
 
-* Mouse Commands::      Moving, cutting, and pasting, with the mouse.
-* Secondary Selection:: Cutting without altering point and mark.
-* Clipboard::           Using the clipboard for selections.
+* Cut and Paste::       Mouse commands for cut and paste.
 * Mouse References::    Using the mouse to select an item from a list.
 * Menu Mouse Clicks::   Mouse clicks that bring up menus.
 * Mode Line Mouse::     Mouse clicks on the mode line.
diff --git a/man/frames.texi b/man/frames.texi
index f3191014434..7d8fdbfd0ce 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -34,11 +34,8 @@ so that you can use many of the features described in this chapter.
 @xref{MS-DOS Mouse}.
 @end ifnottex
 
-
 @menu
-* Mouse Commands::      Moving, cutting, and pasting, with the mouse.
-* Secondary Selection:: Cutting without altering point and mark.
-* Clipboard::           Using the clipboard for selections.
+* Cut and Paste::       Mouse commands for cut and paste.
 * Mouse References::    Using the mouse to select an item from a list.
 * Menu Mouse Clicks::   Mouse clicks that bring up menus.
 * Mode Line Mouse::     Mouse clicks on the mode line.
@@ -60,8 +57,22 @@ so that you can use many of the features described in this chapter.
 * Text-Only Mouse::     Using the mouse in text-only terminals.
 @end menu
 
+@node Cut and Paste
+@section Killing and Yanking on Graphical Displays
+
+  This section describes facilities for selecting a region, killing,
+and yanking using the mouse.
+
+@menu
+* Mouse Commands::      Moving, cutting, and pasting, with the mouse.
+* Cut/Paste Other App:: Transfering text between Emacs and other apps.
+* Word and Line Mouse:: Mouse commands for selecting whole words or lines.
+* Secondary Selection:: Cutting without altering point and mark.
+* Clipboard::           Using the clipboard for selections.
+@end menu
+
 @node Mouse Commands
-@section Mouse Commands for Editing
+@subsection Mouse Commands for Editing
 @cindex mouse buttons (what they do)
 
   The mouse commands for selecting and copying a region are mostly
@@ -154,27 +165,6 @@ entire words or lines.
 
 If you use @kbd{Mouse-3} a second time consecutively, at the same place,
 that kills the region already selected.
-
-@item Double-Mouse-1
-This key sets the region around the word which you click on.  If you
-click on a character with ``symbol'' syntax (such as underscore, in C
-mode), it sets the region around the symbol surrounding that character.
-
-If you click on a character with open-parenthesis or close-parenthesis
-syntax, it sets the region around the parenthetical grouping
-which that character starts or ends.  If you click on a character with
-string-delimiter syntax (such as a singlequote or doublequote in C), it
-sets the region around the string constant (using heuristics to figure
-out whether that character is the beginning or the end of it).
-
-@item Double-Drag-Mouse-1
-This key selects a region made up of the words you drag across.
-
-@item Triple-Mouse-1
-This key sets the region around the line you click on.
-
-@item Triple-Drag-Mouse-1
-This key selects a region made up of the lines you drag across.
 @end table
 
   The simplest way to kill text with the mouse is to press @kbd{Mouse-1}
@@ -191,6 +181,20 @@ point.  Then it does not matter where you click, or even which of the
 frame's windows you click on.  The default value is @code{nil}.  This
 variable also affects yanking the secondary selection.
 
+@cindex Delete Selection mode
+@cindex mode, Delete Selection
+@findex delete-selection-mode
+  Many graphical applications follow the convention that insertion while text
+is selected deletes the selected text.  You can make Emacs behave this
+way by enabling Delete Selection mode---with @kbd{M-x
+delete-selection-mode} or using Custom.  Another effect of this mode
+is that @key{DEL}, @kbd{C-d} and some other keys, when a selection
+exists, will kill the whole selection.  It also enables Transient Mark
+mode (@pxref{Transient Mark}).
+
+@node Cut/Paste Other App
+@subsection Cut and Paste with Other Window Applications
+
 @cindex cutting
 @cindex pasting
 @cindex X cutting and pasting
@@ -224,8 +228,36 @@ to yank, the kill ring contents are used.
 system for selections, use @kbd{C-x @key{RET} x} or @kbd{C-x @key{RET}
 X}.  @xref{Communication Coding}.
 
+@node Word and Line Mouse
+@subsection Mouse Commands for Words and Lines
+
+  These variants of @kbd{Mouse-1} select entire words or lines at a time.
+
+@table @kbd
+@item Double-Mouse-1
+This key sets the region around the word which you click on.  If you
+click on a character with ``symbol'' syntax (such as underscore, in C
+mode), it sets the region around the symbol surrounding that character.
+
+If you click on a character with open-parenthesis or close-parenthesis
+syntax, it sets the region around the parenthetical grouping
+which that character starts or ends.  If you click on a character with
+string-delimiter syntax (such as a singlequote or doublequote in C), it
+sets the region around the string constant (using heuristics to figure
+out whether that character is the beginning or the end of it).
+
+@item Double-Drag-Mouse-1
+This key selects a region made up of the words you drag across.
+
+@item Triple-Mouse-1
+This key sets the region around the line you click on.
+
+@item Triple-Drag-Mouse-1
+This key selects a region made up of the lines you drag across.
+@end table
+
 @node Secondary Selection
-@section Secondary Selection
+@subsection Secondary Selection
 @cindex secondary selection
 
   The @dfn{secondary selection} is another way of selecting text using
@@ -280,7 +312,7 @@ yanks at point.  Then it does not matter precisely where you click; all
 that matters is which window you click on.  @xref{Mouse Commands}.
 
 @node Clipboard
-@section Using the Clipboard
+@subsection Using the Clipboard
 @cindex clipboard
 @vindex x-select-enable-clipboard
 @findex menu-bar-enable-clipboard
diff --git a/man/gnus.texi b/man/gnus.texi
index 7a83ea66a97..ea959671c06 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2810,6 +2810,7 @@ doesn't accept articles.
 
 @item auto-expire
 @cindex auto-expire
+@cindex expiring mail
 If the group parameter has an element that looks like @code{(auto-expire
 . t)}, all articles read will be marked as expirable.  For an
 alternative approach, @pxref{Expiring Mail}.
@@ -2818,6 +2819,7 @@ See also @code{gnus-auto-expirable-newsgroups}.
 
 @item total-expire
 @cindex total-expire
+@cindex expiring mail
 If the group parameter has an element that looks like
 @code{(total-expire . t)}, all read articles will be put through the
 expiry process, even if they are not marked as expirable.  Use with
@@ -3407,6 +3409,7 @@ zombies.
 @item C-c C-x
 @kindex C-c C-x (Group)
 @findex gnus-group-expire-articles
+@cindex expiring mail
 Run all expirable articles in the current group through the expiry
 process (if any) (@code{gnus-group-expire-articles}).  That is, delete
 all expirable articles in the group that have been around for a while.
@@ -3415,6 +3418,7 @@ all expirable articles in the group that have been around for a while.
 @item C-c C-M-x
 @kindex C-c C-M-x (Group)
 @findex gnus-group-expire-all-groups
+@cindex expiring mail
 Run all expirable articles in all groups through the expiry process
 (@code{gnus-group-expire-all-groups}).
 
@@ -3775,6 +3779,7 @@ sub-topics unless given a prefix.
 @item C-c C-x
 @kindex C-c C-x (Topic)
 @findex gnus-topic-expire-articles
+@cindex expiring mail
 Run all expirable articles in the current group or topic through the
 expiry process (if any)
 (@code{gnus-topic-expire-articles}).  (@pxref{Expiring Mail}).
@@ -10060,6 +10065,7 @@ process/prefix convention (@pxref{Process/Prefix}).
 @item B e
 @kindex B e (Summary)
 @findex gnus-summary-expire-articles
+@cindex expiring mail
 Run all expirable articles in the current group through the expiry
 process (@code{gnus-summary-expire-articles}).  That is, delete all
 expirable articles in the group that have been around for a while.
@@ -10068,6 +10074,7 @@ expirable articles in the group that have been around for a while.
 @item B C-M-e
 @kindex B C-M-e (Summary)
 @findex gnus-summary-expire-articles-now
+@cindex expiring mail
 Delete all the expirable articles in the group
 (@code{gnus-summary-expire-articles-now}).  This means that @strong{all}
 articles eligible for expiry in the current group will
@@ -11216,42 +11223,66 @@ group.  Values in parenthesis are suggested sensible values.  Others are
 possible but those listed are probably sufficient for most people.
 
 @table @code
+@vindex gnus-treat-buttonize
 @item gnus-treat-buttonize (t, integer)
+@vindex gnus-treat-buttonize-head
 @item gnus-treat-buttonize-head (head)
 
 @xref{Article Buttons}.
 
+@vindex gnus-treat-capitalize-sentences
 @item gnus-treat-capitalize-sentences (t, integer)
+@vindex gnus-treat-overstrike
 @item gnus-treat-overstrike (t, integer)
+@vindex gnus-treat-strip-cr
 @item gnus-treat-strip-cr (t, integer)
+@vindex gnus-treat-strip-headers-in-body
 @item gnus-treat-strip-headers-in-body (t, integer)
+@vindex gnus-treat-strip-leading-blank-lines
 @item gnus-treat-strip-leading-blank-lines (t, integer)
+@vindex gnus-treat-strip-multiple-blank-lines
 @item gnus-treat-strip-multiple-blank-lines (t, integer)
+@vindex gnus-treat-strip-pem
 @item gnus-treat-strip-pem (t, last, integer)
+@vindex gnus-treat-strip-trailing-blank-lines
 @item gnus-treat-strip-trailing-blank-lines (t, last, integer)
+@vindex gnus-treat-unsplit-urls
 @item gnus-treat-unsplit-urls (t, integer)
+@vindex gnus-treat-wash-html
 @item gnus-treat-wash-html (t, integer)
 
 @xref{Article Washing}.
 
+@vindex gnus-treat-date-english
 @item gnus-treat-date-english (head)
+@vindex gnus-treat-date-iso8601
 @item gnus-treat-date-iso8601 (head)
+@vindex gnus-treat-date-lapsed
 @item gnus-treat-date-lapsed (head)
+@vindex gnus-treat-date-local
 @item gnus-treat-date-local (head)
+@vindex gnus-treat-date-original
 @item gnus-treat-date-original (head)
+@vindex gnus-treat-date-user-defined
 @item gnus-treat-date-user-defined (head)
+@vindex gnus-treat-date-ut
 @item gnus-treat-date-ut (head)
 
 @xref{Article Date}.
 
+@vindex gnus-treat-from-picon
 @item gnus-treat-from-picon (head)
+@vindex gnus-treat-mail-picon
 @item gnus-treat-mail-picon (head)
+@vindex gnus-treat-newsgroups-picon
 @item gnus-treat-newsgroups-picon (head)
 
 @xref{Picons}.
 
+@vindex gnus-treat-display-smileys
 @item gnus-treat-display-smileys (t, integer)
 
+@vindex gnus-treat-body-boundary
 @item gnus-treat-body-boundary (head)
 
 @vindex gnus-body-boundary-delimiter
@@ -11260,40 +11291,62 @@ is controlled by @code{gnus-body-boundary-delimiter}.
 
 @xref{Smileys}.
 
+@vindex gnus-treat-display-x-face
 @item gnus-treat-display-x-face (head)
 
 @xref{X-Face}.
 
+@vindex gnus-treat-display-face
 @item gnus-treat-display-face (head)
 
 @xref{Face}.
 
+@vindex gnus-treat-emphasize
 @item gnus-treat-emphasize (t, head, integer)
+@vindex gnus-treat-fill-article
 @item gnus-treat-fill-article (t, integer)
+@vindex gnus-treat-fill-long-lines
 @item gnus-treat-fill-long-lines (t, integer)
+@vindex gnus-treat-hide-boring-headers
 @item gnus-treat-hide-boring-headers (head)
+@vindex gnus-treat-hide-citation
 @item gnus-treat-hide-citation (t, integer)
+@vindex gnus-treat-hide-citation-maybe
 @item gnus-treat-hide-citation-maybe (t, integer)
+@vindex gnus-treat-hide-headers
 @item gnus-treat-hide-headers (head)
+@vindex gnus-treat-hide-signature
 @item gnus-treat-hide-signature (t, last)
+@vindex gnus-treat-strip-banner
 @item gnus-treat-strip-banner (t, last)
+@vindex gnus-treat-strip-list-identifiers
 @item gnus-treat-strip-list-identifiers (head)
 
 @xref{Article Hiding}.
 
+@vindex gnus-treat-highlight-citation
 @item gnus-treat-highlight-citation (t, integer)
+@vindex gnus-treat-highlight-headers
 @item gnus-treat-highlight-headers (head)
+@vindex gnus-treat-highlight-signature
 @item gnus-treat-highlight-signature (t, last, integer)
 
 @xref{Article Highlighting}.
 
+@vindex gnus-treat-play-sounds
 @item gnus-treat-play-sounds
+@vindex gnus-treat-translate
 @item gnus-treat-translate
+@vindex gnus-treat-x-pgp-sig
 @item gnus-treat-x-pgp-sig (head)
 
+@vindex gnus-treat-unfold-headers
 @item gnus-treat-unfold-headers (head)
+@vindex gnus-treat-fold-headers
 @item gnus-treat-fold-headers (head)
+@vindex gnus-treat-fold-newsgroups
 @item gnus-treat-fold-newsgroups (head)
+@vindex gnus-treat-leading-whitespace
 @item gnus-treat-leading-whitespace (head)
 
 @xref{Article Header}.
@@ -14511,6 +14564,7 @@ using the new mail back end.
 @node Expiring Mail
 @subsection Expiring Mail
 @cindex article expiry
+@cindex expiring mail
 
 Traditional mail readers have a tendency to remove mail articles when
 you mark them as read, in some way.  Gnus takes a fundamentally
@@ -16454,6 +16508,7 @@ as ticked for other users.
 @item nnimap-expunge-search-string
 @cindex expunging
 @vindex nnimap-expunge-search-string
+@cindex expiring @acronym{IMAP} mail
 
 This variable contain the @acronym{IMAP} search command sent to server when
 searching for articles eligible for expiring.  The default is
@@ -16465,6 +16520,10 @@ Probably the only useful value to change this to is
 messages instead of the internal article date.  See section 6.4.4 of
 RFC 2060 for more information on valid strings.
 
+However, if @code{nnimap-search-uids-not-since-is-evil} 
+is true, this variable has no effect since the search logic
+is reversed, as described below.
+
 @item nnimap-authinfo-file
 @vindex nnimap-authinfo-file
 
@@ -16490,6 +16549,47 @@ Unselect mailboxes before looking for new mail in them.  Some servers
 seem to need this under some circumstances; it was reported that
 Courier 1.7.1 did.
 
+@item nnimap-nov-is-evil
+@vindex nnimap-nov-is-evil
+@cindex Courier @acronym{IMAP} server
+@cindex @acronym{NOV}
+
+Never generate or use a local @acronym{NOV} database. Defaults to the
+value of @code{gnus-agent}.
+
+Using a @acronym{NOV} database usually makes header fetching much
+faster, but it uses the @code{UID SEARCH UID} command, which is very
+slow on some servers (notably some versions of Courier). Since the Gnus
+Agent caches the information in the @acronym{NOV} database without using
+the slow command, this variable defaults to true if the Agent is in use,
+and false otherwise.
+
+@item nnimap-search-uids-not-since-is-evil
+@vindex nnimap-search-uids-not-since-is-evil
+@cindex Courier @acronym{IMAP} server
+@cindex expiring @acronym{IMAP} mail
+
+Avoid the @code{UID SEARCH UID @var{message numbers} NOT SINCE
+@var{date}} command, which is slow on some @acronym{IMAP} servers
+(notably, some versions of Courier). Instead, use @code{UID SEARCH SINCE
+@var{date}} and prune the list of expirable articles within Gnus.
+
+When Gnus expires your mail (@pxref{Expiring Mail}), it starts with a
+list of expirable articles and asks the IMAP server questions like ``Of
+these articles, which ones are older than a week?'' While this seems
+like a perfectly reasonable question, some IMAP servers take a long time
+to answer it, since they seemingly go looking into every old article to
+see if it is one of the expirable ones. Curiously, the question ``Of
+@emph{all} articles, which ones are newer than a week?'' seems to be
+much faster to answer, so setting this variable causes Gnus to ask this
+question and figure out the answer to the real question itself.
+
+This problem can really sneak up on you: when you first configure Gnus,
+everything works fine, but once you accumulate a couple thousand
+messages, you start cursing Gnus for being so slow. On the other hand,
+if you get a lot of email within a week, setting this variable will
+cause a lot of network traffic between Gnus and the IMAP server.
+
 @end table
 
 @menu
@@ -16677,7 +16777,7 @@ splitting function that analyzes the body to split the article.
 
 @node Expiring in IMAP
 @subsection Expiring in IMAP
-@cindex expiring imap mail
+@cindex expiring @acronym{IMAP} mail
 
 Even though @code{nnimap} is not a proper @code{nnmail} derived back
 end, it supports most features in regular expiring (@pxref{Expiring
@@ -16696,6 +16796,9 @@ you to view client specific flags on the message.  It also means that
 your server must support permanent storage of client specific flags on
 messages.  Most do, fortunately.
 
+If expiring @acronym{IMAP} mail seems very slow, try setting the server
+variable @code{nnimap-search-uids-not-since-is-evil}.
+
 @table @code
 
 @item nnmail-expiry-wait
@@ -18605,7 +18708,7 @@ sense if you are using a nntp or nnimap back end.
 @findex gnus-agent-expire-group
 @cindex agent expiry
 @cindex Gnus agent expiry
-@cindex expiry
+@cindex expiry, in Gnus agent
 
 The Agent back end, @code{nnagent}, doesn't handle expiry.  Well, at
 least it doesn't handle it like other back ends.  Instead, there are
@@ -23324,9 +23427,6 @@ From Ted Zlatanov <tzz@@lifelogs.com>.
 (gnus-registry-initialize)
 (spam-initialize)
 
-;; @r{I like @kbd{C-s} for marking spam}
-(define-key gnus-summary-mode-map "\C-s" 'gnus-summary-mark-as-spam)
-
 (setq
  spam-log-to-registry t     ; @r{for spam autodetection}
  spam-use-BBDB t
@@ -23898,7 +23998,7 @@ The actual string used is irrelevant, but you probably want to leave
 the default value of @samp{spam}.
 @end defvar
 
-@defvar spam-ifile-database-path
+@defvar spam-ifile-database
 
 This is the filename for the ifile database.  It is not specified by
 default, so ifile will use its own default database name.
diff --git a/man/killing.texi b/man/killing.texi
index 4be77e2d6f8..396a76328aa 100644
--- a/man/killing.texi
+++ b/man/killing.texi
@@ -56,14 +56,14 @@ an error message when this happens.  But if you set the variable
 @code{kill-read-only-ok} to a non-@code{nil} value, they just print a
 message in the echo area to explain why the text has not been erased.
 
+  You can also use the mouse to kill and yank.  @xref{Cut and Paste}.
+
 @menu
 * Deletion::            Commands for deleting small amounts of text and
                           blank areas.
 * Killing by Lines::    How to kill entire lines of text at one time.
 * Other Kill Commands:: Commands to kill large regions of text and
                           syntactic units such as words and sentences.
-* Graphical Kill::      The kill ring on graphical displays:
-                          yanking between applications.
 @end menu
 
 @need 1500
@@ -148,10 +148,11 @@ enters Help instead, see @ref{DEL Does Not Delete}.
   The other delete commands are those which delete only whitespace
 characters: spaces, tabs and newlines.  @kbd{M-\}
 (@code{delete-horizontal-space}) deletes all the spaces and tab
-characters before and after point.  @kbd{M-@key{SPC}}
+characters before and after point.  (With a prefix argument, it
+deletes them before point, but not after.)  @kbd{M-@key{SPC}}
 (@code{just-one-space}) does likewise but leaves a single space after
-point, regardless of the number of spaces that existed previously (even
-if there were none before).  With a numeric argument @var{n}, it
+point, regardless of the number of spaces that existed previously
+(even if there were none before).  With a numeric argument @var{n}, it
 leaves @var{n} spaces after point.
 
   @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines
@@ -250,28 +251,6 @@ and @kbd{M-d} (@pxref{Words}); balanced expressions, with @kbd{C-M-k}
 (@pxref{Expressions}); and sentences, with @kbd{C-x @key{DEL}} and
 @kbd{M-k} (@pxref{Sentences}).@refill
 
-@node Graphical Kill
-@subsection Killing on Graphical Displays
-
-  On graphical displays with window systems, the most recent kill done
-in Emacs is also the primary selection, if it is more recent than any
-selection you made in another program.  This means that the paste
-commands of other window-based applications copy the text that you
-killed in Emacs.  In addition, Emacs yank commands treat other
-applications' selections as part of the kill ring, so you can yank
-them into Emacs.
-
-@cindex Delete Selection mode
-@cindex mode, Delete Selection
-@findex delete-selection-mode
-  Many graphical applications follow the convention that insertion while text
-is selected deletes the selected text.  You can make Emacs behave this
-way by enabling Delete Selection mode---with @kbd{M-x
-delete-selection-mode} or using Custom.  Another effect of this mode
-is that @key{DEL}, @kbd{C-d} and some other keys, when a selection
-exists, will kill the whole selection.  It also enables Transient Mark
-mode (@pxref{Transient Mark}).
-
 @node Yanking, Accumulating Text, Killing, Top
 @section Yanking
 @cindex moving text
@@ -668,14 +647,14 @@ applications.  @kbd{C-x} means cut (kill), @kbd{C-c} copy, @kbd{C-v}
 paste (yank), and @kbd{C-z} undo.  Standard Emacs commands like
 @kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take
 effect when the mark is active (and the region is highlighted).
-However, if you don't want to override these bindings Emacs at all, set
-@code{cua-enable-cua-keys} to @code{nil}.
+However, if you don't want to override these bindings in Emacs at all,
+set @code{cua-enable-cua-keys} to @code{nil}.
 
   In CUA mode, using @kbd{Shift} together with the movement keys
 activates and highlights the region over which they move.  The
 standard (unshifted) movement keys deactivate the mark, and typed text
 replaces the active region as in Delete-Selection mode
-(@pxref{Graphical Kill}).
+(@pxref{Mouse Commands}).
 
   To enter an Emacs command like @kbd{C-x C-f} while the mark is
 active, use one of the following methods: either hold @kbd{Shift}
diff --git a/man/major.texi b/man/major.texi
index d1f3fbaeebf..fe9416aacde 100644
--- a/man/major.texi
+++ b/man/major.texi
@@ -102,17 +102,21 @@ the element has the form @code{(@var{regexp} @var{mode-function}
 @vindex magic-mode-alist
   Sometimes the major mode is determined from the way the file's text
 begins.  The variable @code{magic-mode-alist} controls this.  Its value
-is a list of elements of this form:
+is a list of elements of these forms:
 
 @example
 (@var{regexp} . @var{mode-function})
+(@var{match-function} . @var{mode-function})
 @end example
 
 @noindent
-This looks like an element of @code{auto-mode-alist}, but it doesn't work
-the same: this @var{regexp} is matched against the text at the start
-of the buffer, not against the file name.  @code{magic-mode-alist}
-takes priority over @code{auto-mode-alist}.
+The first form looks like an element of @code{auto-mode-alist}, but it
+doesn't work the same: this @var{regexp} is matched against the text
+at the start of the buffer, not against the file name.  Likewise, the
+second form calls @var{match-function} at the beginning of the buffer,
+and if the function returns non-@code{nil}, the @var{mode-function} is
+called.  @code{magic-mode-alist} takes priority over
+@code{auto-mode-alist}.
 
   You can specify the major mode to use for editing a certain file by
 special text in the first nonblank line of the file.  The
@@ -144,6 +148,14 @@ which allows you to specify local variables as well, like this:
 @noindent
 @xref{File Variables}, for more information about this.
 
+@vindex auto-mode-case-fold
+  On systems with case-insensitive file names, only a single
+case-insensitive search through the @code{auto-mode-alist} is made.
+On other systems, Emacs normally performs a single case-sensitive
+search through the alist, but if you set this variable to a
+non-@code{nil} value, Emacs will perform a second case-insensitive
+search if the first search fails.
+
 @vindex interpreter-mode-alist
   When a file's contents begin with @samp{#!}, it can serve as an
 executable shell command, which works by running an interpreter named on
diff --git a/man/mark.texi b/man/mark.texi
index e39800ab1b5..7cba4f0d004 100644
--- a/man/mark.texi
+++ b/man/mark.texi
@@ -192,7 +192,7 @@ region active again by typing @kbd{C-x C-x}.
 
 @item
 If Delete Selection mode is also enabled, some commands delete the
-region when used while the mark is active.  @xref{Graphical Kill}.
+region when used while the mark is active.  @xref{Mouse Commands}.
 
 @item
 Quitting with @kbd{C-g} deactivates the mark.
diff --git a/man/msdog.texi b/man/msdog.texi
index d92929ea04e..69126dca207 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -173,9 +173,9 @@ default ignores letter-case in file names during completion.
 @vindex w32-get-true-file-attributes
   If the variable @code{w32-get-true-file-attributes} is
 non-@code{nil} (the default), Emacs tries to determine the accurate
-link counts for files.  This option is only useful on the NT family of
-Windows (2K/XP/2K3), and it considerably slows down Dired and other
-features, so use it only on fast machines.
+link counts for files.  This option is only useful on NTFS volumes,
+and it considerably slows down Dired and other features, so use it
+only on fast machines.
 
 @node ls in Lisp
 @section Emulation of @code{ls} on MS-Windows
@@ -234,10 +234,11 @@ that @file{ls-lisp.el} displays.  The value should be a list that
 contains one or more of the symbols @code{links}, @code{uid}, and
 @code{gid}.  @code{links} means display the count of different file
 names that are associated with (a.k.a.@: @dfn{links to}) the file's
-data.  @code{uid} means display the numerical identifier of the user
-who owns the file.  @code{gid} means display the numerical identifier
-of the file owner's group.  The default value is @code{(links uid gid)}
-i.e.@: all the 3 optional attributes are displayed.
+data; this is only useful on NTFS volumes.  @code{uid} means display
+the numerical identifier of the user who owns the file.  @code{gid}
+means display the numerical identifier of the file owner's group.  The
+default value is @code{(links uid gid)} i.e.@: all the 3 optional
+attributes are displayed.
 
 @vindex ls-lisp-emulation
   The variable @code{ls-lisp-emulation} controls the flavour of the
@@ -332,6 +333,13 @@ directory, whereas @file{.emacs} does not.
   This section describes the Windows-specific features related to
 keyboard input in Emacs.
 
+@cindex MS-Windows keyboard shortcuts
+  Many key combinations (known as ``keyboard shortcuts'') that are in
+widespread use in MS-Windows programs are taken by various Emacs
+features.  Examples include @kbd{C-C}, @kbd{C-X}, @kbd{C-Z},
+@kbd{C-A}, and @kbd{W-SPC}.  You can get some of them back by turning
+on CUA Mode (@pxref{CUA Bindings}).
+
 @kindex F10 @r{(MS-Windows)}
 @cindex menu bar access using keyboard @r{(MS-Windows)}
   The @key{F10} key on Windows activates the menu bar in a way that
@@ -420,16 +428,24 @@ keys are passed to Windows or swallowed by Emacs.  If the value is
 otherwise it is passed to Windows.  The default is @code{t} for both
 of these variables.  Passing each of these keys to Windows produces
 its normal effect: for example, @kbd{@key{Lwindow}} opens the
-@code{Start} menu, etc.
+@code{Start} menu, etc.@footnote{
+Some combinations of the ``Windows'' keys with other keys are caught
+by Windows at low level in a way that Emacs currently cannot prevent.
+For example, @kbd{@key{Lwindow} r} always pops up the Windows
+@samp{Run} dialog.  Customizing the value of
+@code{w32-phantom-key-code} might help in some cases, though.}
 
 @vindex w32-recognize-altgr
 @kindex AltGr @r{(MS-Windows)}
 @cindex AltGr key (MS-Windows)
-  The variable @code{w32-recognize-altgr} controls whether the right
-@key{Alt} and left @key{Ctrl} keys are recognized as the @key{AltGr}
-key.  The default is @code{t}, which means these keys produce
-@code{AltGr}; setting them to @code{nil} causes these keys to be
-interpreted normally (as the respective modifiers).
+  The variable @code{w32-recognize-altgr} controls whether the
+@key{AltGr} key (if it exists on your keyboard), or its equivalent,
+the combination of the right @key{Alt} and left @key{Ctrl} keys
+pressed together, is recognized as the @key{AltGr} key.  The default
+is @code{t}, which means these keys produce @code{AltGr}; setting it
+to @code{nil} causes @key{AltGr} or the equivalent key combination to
+be interpreted as the combination of @key{CTRL} and @key{META}
+modifiers.
 @end ifnottex
 
 @node Windows Mouse
diff --git a/man/pgg.texi b/man/pgg.texi
index 23bcd5cbb1e..af97ddec45d 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -74,10 +74,19 @@ PGG requires at least one implementation of privacy guard system.
 This document assumes that you have already obtained and installed them
 and that you are familiar with its basic functions.
 
-By default, PGG uses GnuPG, but Pretty Good Privacy version 2 or version
-5 are also supported.  If you are new to such a system, I recommend that
-you should look over the GNU Privacy Handbook (GPH) which is available
-at @uref{http://www.gnupg.org/gph/}.
+By default, PGG uses GnuPG.  If you are new to such a system, I
+recommend that you should look over the GNU Privacy Handbook (GPH)
+which is available at @uref{http://www.gnupg.org/documentation/}.
+
+When using GnuPG, we recommend the use of the @code{gpg-agent}
+program, which is distributed with versions 2.0 and later of GnuPG.
+This is a daemon to manage private keys independently from any
+protocol, and provides the most secure way to input and cache your
+passphrases (@pxref{Caching passphrase}).  By default, PGG will
+attempt to use @code{gpg-agent} if it is running.  @xref{Invoking
+GPG-AGENT,,,gnupg,Using the GNU Privacy Guard}.
+
+PGG also supports Pretty Good Privacy version 2 or version 5.
 
 @node How to use
 @chapter How to use
@@ -238,8 +247,8 @@ Elapsed time for expiration in seconds.
 When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for
 caching@footnote{Actually @code{gpg-agent} does not cache passphrases
 but private keys.  On the other hand, from a users point of view this
-technical difference isn't visible.}.  If non-@code{nil} try to use a
-running @code{gpg-agent}.  It defaults to @code{nil}.
+technical difference isn't visible.}.  It defaults to @code{t}.
+Setting this to @code{nil} is not recommended.
 @end defvar
 
 @node Default user identity
diff --git a/man/programs.texi b/man/programs.texi
index fb85e470f86..200c787cf08 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -156,23 +156,11 @@ from Lisp, but in Emacs we use it for all languages.
 @cindex open-parenthesis in leftmost column
 @cindex ( in leftmost column
   Emacs assumes by default that any opening delimiter found at the
-left margin is the start of a top-level definition, or defun.  You can
-override this default by setting this user option:
-
-@defvar open-paren-in-column-0-is-defun-start
-If this user option is set to @code{t} (the default), opening
-parentheses or braces at column zero always start defuns.  When it's
-@code{nil}, defuns are found by searching for parens or braces at the
-outermost level.  Some major modes, including C and related modes, set
-@code{open-paren-in-column-0-is-defun-start} buffer-locally to
-@code{nil}
-@end defvar
-
-  In modes where @code{open-paren-in-column-0-is-defun-start} is
-@code{t}, @strong{don't put an opening delimiter at the left margin
-unless it is a defun start}.  For instance, never put an
+left margin is the start of a top-level definition, or defun.
+Therefore, @strong{don't put an opening delimiter at the left margin
+unless it should have that significance}.  For instance, never put an
 open-parenthesis at the left margin in a Lisp file unless it is the
-start of a top-level list.
+start of a top-level list.  
 
   If you don't follow this convention, not only will you have trouble
 when you explicitly use the commands for motion by defuns; other
@@ -182,10 +170,10 @@ mode (@pxref{Font Lock}).
 
   The most likely problem case is when you want an opening delimiter
 at the start of a line inside a string.  To avoid trouble, put an
-escape character (@samp{\}, in Emacs Lisp, @samp{/} in some other Lisp
-dialects) before the opening delimiter.  This will not affect the
-contents of the string, but will prevent that opening delimiter from
-starting a defun.  Here's an example:
+escape character (@samp{\}, in C and Emacs Lisp, @samp{/} in some
+other Lisp dialects) before the opening delimiter.  This will not
+affect the contents of the string, but will prevent that opening
+delimiter from starting a defun.  Here's an example:
 
 @example
   (insert "Foo:
@@ -197,6 +185,25 @@ starting a defun.  Here's an example:
 highlights confusing opening delimiters (those that ought to be
 quoted) in bold red.
 
+If you need to override this convention, you can so by setting this
+user option:
+
+@defvar open-paren-in-column-0-is-defun-start
+If this user option is set to @code{t} (the default), opening
+parentheses or braces at column zero always start defuns.  When it's
+@code{nil}, defuns are found by searching for parens or braces at the
+outermost level.
+@end defvar
+
+  Usually, you shouldn't need to set
+@code{open-paren-in-column-0-is-defun-start} to @code{nil}.  However,
+if your buffer contains parentheses or braces in column zero which
+don't start defuns and this confuses Emacs, it sometimes helps to set
+the option to @code{nil}.  Be aware, though, that this will make
+scrolling and display in large buffers quite sluggish, and that
+parentheses and braces must be correctly matched throughout the buffer
+for it to work properly.
+
   In the earliest days, the original Emacs found defuns by moving
 upward a level of parentheses or braces until there were no more
 levels to go up.  This always required scanning all the way back to
@@ -1557,10 +1564,10 @@ preprocessor commands.
 @table @kbd
 @item C-c C-@key{DEL}
 @itemx C-c @key{DEL}
-@findex c-hungry-backspace
+@findex c-hungry-delete-backwards
 @kindex C-c C-@key{DEL} (C Mode)
 @kindex C-c @key{DEL} (C Mode)
-@code{c-hungry-backspace}---Delete the entire block of whitespace
+@code{c-hungry-delete-backwards}---Delete the entire block of whitespace
 preceding point.
 
 @item C-c C-d
diff --git a/man/search.texi b/man/search.texi
index 67b61aeac07..532d58fb9d8 100644
--- a/man/search.texi
+++ b/man/search.texi
@@ -488,6 +488,13 @@ search can make the cursor move back and start again.  For example, if
 you have searched for @samp{foo} and you add @samp{\|bar}, the cursor
 backs up in case the first @samp{bar} precedes the first @samp{foo}.
 
+  Forward and backward regexp search are not symmetrical, because
+regexp matching in Emacs always operates forward, starting with the
+beginning of the regexp.  Thus, forward regexp search scans forward,
+trying a forward match at each possible starting position.  Backward
+regexp search scans backward, trying a forward match at each possible
+starting position.  These search methods are not mirror images.
+
 @findex re-search-forward
 @findex re-search-backward
   Nonincremental search for a regexp is done by the functions
diff --git a/man/tramp.texi b/man/tramp.texi
index 48d13b67ee3..4a09e2daa3c 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -832,6 +832,26 @@ to not print any shell prompt, which confuses @value{tramp} mightily.
 This method supports the @samp{-p} hack.
 
 
+@item @option{scpc} --- @command{ssh} and @command{scp}
+@cindex method scpx
+@cindex scpx method
+@cindex scp (with scpx method)
+@cindex ssh (with scpx method)
+
+Newer versions of @option{ssh} (for example OpenSSH 4) offer an option
+@option{ControlMaster}.  This allows @option{scp} to reuse an existing
+@option{ssh} channel, which increases performance.
+
+Before you use this method, you shall check whether your @option{ssh}
+implementation does support this option.  Try from the command line
+
+@example
+ssh localhost -o ControlMaster=yes
+@end example
+
+This method supports the @samp{-p} hack.
+
+
 @item @option{pscp} --- @command{plink} and @command{pscp}
 @cindex method pscp
 @cindex pscp method
diff --git a/man/trampver.texi b/man/trampver.texi
index bf220f4b195..a7777b00c79 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -4,12 +4,12 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.0.54
+@set trampver 2.0.55
 
 @c Other flags from configuration
 @set prefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
-@set infodir /usr/local/info
+@set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
 @set tramp @sc{tramp}
diff --git a/man/xresources.texi b/man/xresources.texi
index e9233df25d5..142b1bc70a0 100644
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -11,7 +11,7 @@ can customize some of the same aspects using the system registry.
 @xref{MS-Windows Registry}.  Likewise, Emacs on MacOS Carbon emulates X
 resources using the Preferences system.  @xref{Mac Environment Variables}.
 
-  When Emacs is built using an ``X toolkit'', such as Lucid or 
+  When Emacs is built using an ``X toolkit'', such as Lucid or
 LessTif, you need to use X resources to customize the appearance of
 the widgets, including the menu-bar, scroll-bar, and dialog boxes.
 This is because the libraries that implement these don't provide for
@@ -73,7 +73,7 @@ and their particular meanings.  Case distinctions are significant in
 these names.  Each resource specification in @file{~/.Xdefaults}
 states the name of the program and the name of the resource.  For
 Emacs, the program name is @samp{Emacs}.  It looks like this:
- 
+
 @example
 Emacs.borderWidth: 2
 @end example
@@ -321,6 +321,9 @@ Number of lines to reserve for the tool bar.  A zero value suppresses
 the tool bar.  If the value is non-zero and
 @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's size
 will be changed automatically so that all tool bar items are visible.
+  If the value of @code{auto-resize-tool-bars} is @code{grow-only},
+the tool bar expands automatically, but does not contract automatically.
+To contract the tool bar, you must redraw the frame by entering @kbd{C-l}.
 
 @item @code{useXIM} (class @code{UseXIM})
 @cindex XIM
@@ -438,7 +441,7 @@ Emacs.pane.menubar.font:  8x16
 
 @noindent
 Resources for @emph{non-menubar} toolkit pop-up menus have
-@samp{menu*} instead of @samp{pane.menubar}.  For example, to specify 
+@samp{menu*} instead of @samp{pane.menubar}.  For example, to specify
 the font @samp{8x16} for the pop-up menu items, write this:
 
 @example
@@ -701,7 +704,7 @@ the menubar and the scroll bar in Emacs we use:
 widget "Emacs.pane.menubar" style "my_style"
 widget "Emacs.pane.emacs.verticalScrollBar" style "my_style"
 @end smallexample
- 
+
 But to avoid having to type it all, wildcards are often used.  @samp{*}
 matches zero or more characters and @samp{?} matches one character.  So "*"
 matches all widgets.