Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

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

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

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

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

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

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

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

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

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

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

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

10 files changed, 136 insertions, 92 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index ad357f99680..c2d58789490 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,42 @@
+2007-03-21  Glenn Morris  <rgm@gnu.org>
+
+        * eshell.texi (Known problems): Emacs 22 comes with eshell 2.4.2.
+
+2007-03-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eshell.texi (Known problems): Emacs 21 -> 22.
+
+        * cc-mode.texi (Performance Issues): Update note about 21.3 to 22.1.
+
+2007-03-18  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Time Zones): Mention that the DST rules changed in 2007.
+
+2007-03-12  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi (Time Zones): Switch to new North America DST rule.
+
+        * calendar.texi, emacs.texi (Daylight Saving): Rename node from
+        "Daylight Savings".
+
+        * calc.texi, calendar.texi: Replace "daylight savings" with "daylight
+        saving" in text throughout.
+
+2007-03-11  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus.texi (Mail and Post): Update documentation for gnus-user-agent.
+        The variable now uses a list of symbols instead of just a symbol.
+        Reported by Christoph Conrad <christoph.conrad@gmx.de>.
+
+2007-03-06  Romain Francoise  <romain@orebokech.com>
+
+        * faq.texi (New in Emacs 22): Don't say "now" too much.  Add MH-E to
+        new packages, and mention Gnus update.
+
+2007-03-04  Richard Stallman  <rms@gnu.org>
+
+        * custom.texi (Safe File Variables): Minor correction.
+
 2007-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (NNTP): Mention nntp-never-echoes-commands and
@@ -306,9 +345,9 @@
 
 2006-12-24  Kevin Ryde  <user42@zip.com.au>
 
-        * calendar.texi (Holidays): US daylight savings begins second Sunday
+        * calendar.texi (Holidays): US daylight saving begins second Sunday
         in March for 2007 onwards.
-        (Daylight Savings): Show new US default daylight savings rules, 2nd
+        (Daylight Savings): Show new US default daylight saving rules, 2nd
         Sun in Mar to 1st Sun in Nov, now in cal-dst.el.
 
 2006-12-23  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/man/calc.texi b/man/calc.texi
index ca7167905cb..0544bc1e3b4 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -17364,31 +17364,32 @@ business day.
 
 @noindent
 @cindex Time zones
-@cindex Daylight savings time
-Time zones and daylight savings time are a complicated business.
+@cindex Daylight saving time
+Time zones and daylight saving time are a complicated business.
 The conversions to and from Julian and Unix-style dates automatically
-compute the correct time zone and daylight savings adjustment to use,
+compute the correct time zone and daylight saving adjustment to use,
 provided they can figure out this information.  This section describes
 Calc's time zone adjustment algorithm in detail, in case you want to
 do conversions in different time zones or in case Calc's algorithms
 can't determine the right correction to use.
 
-Adjustments for time zones and daylight savings time are done by
+Adjustments for time zones and daylight saving time are done by
 @kbd{t U}, @kbd{t J}, @kbd{t N}, and @kbd{t C}, but not by any other
 commands.  In particular, @samp{<may 1 1991> - <apr 1 1991>} evaluates
-to exactly 30 days even though there is a daylight-savings
+to exactly 30 days even though there is a daylight-saving
 transition in between.  This is also true for Julian pure dates:
 @samp{julian(<may 1 1991>) - julian(<apr 1 1991>)}.  But Julian
-and Unix date/times will adjust for daylight savings time:
+and Unix date/times will adjust for daylight saving time:  using Calc's
+default daylight saving time rule (see the explanation below),
 @samp{julian(<12am may 1 1991>) - julian(<12am apr 1 1991>)}
-evaluates to @samp{29.95834} (that's 29 days and 23 hours)
-because one hour was lost when daylight savings commenced on
+evaluates to @samp{29.95833} (that's 29 days and 23 hours)
+because one hour was lost when daylight saving commenced on
 April 7, 1991.
 
 In brief, the idiom @samp{julian(@var{date1}) - julian(@var{date2})}
 computes the actual number of 24-hour periods between two dates, whereas
 @samp{@var{date1} - @var{date2}} computes the number of calendar
-days between two dates without taking daylight savings into account.
+days between two dates without taking daylight saving into account.
 
 @pindex calc-time-zone
 @ignore
@@ -17400,7 +17401,7 @@ zone specified by its numeric prefix argument into a number of
 seconds difference from Greenwich mean time (GMT).  If the argument
 is a number, the result is simply that value multiplied by 3600.
 Typical arguments for North America are 5 (Eastern) or 8 (Pacific).  If
-Daylight Savings time is in effect, one hour should be subtracted from
+Daylight Saving time is in effect, one hour should be subtracted from
 the normal difference.
 
 If you give a prefix of plain @kbd{C-u}, @code{calc-time-zone} (like other
@@ -17411,12 +17412,12 @@ stack position.)  This allows you to give a non-integer time zone
 adjustment.  The time-zone argument can also be an HMS form, or
 it can be a variable which is a time zone name in upper- or lower-case.
 For example @samp{tzone(PST) = tzone(8)} and @samp{tzone(pdt) = tzone(7)}
-(for Pacific standard and daylight savings times, respectively).
+(for Pacific standard and daylight saving times, respectively).
 
 North American and European time zone names are defined as follows;
 note that for each time zone there is one name for standard time,
-another for daylight savings time, and a third for ``generalized'' time
-in which the daylight savings adjustment is computed from context.
+another for daylight saving time, and a third for ``generalized'' time
+in which the daylight saving adjustment is computed from context.
 
 @smallexample
 @group
@@ -17441,7 +17442,7 @@ Pacific Time look like this:
 @smallexample
 @group
 ( ( "PST" 8 0 )    ; Name as an upper-case string, then standard
-  ( "PDT" 8 -1 )   ; adjustment, then daylight savings adjustment.
+  ( "PDT" 8 -1 )   ; adjustment, then daylight saving adjustment.
   ( "PGT" 8 "PST" "PDT" ) )   ; Generalized time zone.
 @end group
 @end smallexample
@@ -17464,10 +17465,10 @@ i.e., it uses the local time zone as obtained from the @code{date}
 command.
 
 If the time zone name found is one of the standard or daylight
-savings zone names from the above table, and Calc's internal
-daylight savings algorithm says that time and zone are consistent
+saving zone names from the above table, and Calc's internal
+daylight saving algorithm says that time and zone are consistent
 (e.g., @code{PDT} accompanies a date that Calc's algorithm would also
-consider to be daylight savings, or @code{PST} accompanies a date
+consider to be daylight saving, or @code{PST} accompanies a date
 that Calc would consider to be standard time), then Calc substitutes
 the corresponding generalized time zone (like @code{PGT}).
 
@@ -17484,38 +17485,41 @@ The @kbd{t J} and @code{t U} commands with no numeric prefix
 arguments do the same thing as @samp{tzone()}.  If the current
 time zone is a generalized time zone, e.g., @code{EGT}, Calc
 examines the date being converted to tell whether to use standard
-or daylight savings time.  But if the current time zone is explicit,
+or daylight saving time.  But if the current time zone is explicit,
 e.g., @code{EST} or @code{EDT}, then that adjustment is used exactly
-and Calc's daylight savings algorithm is not consulted.
+and Calc's daylight saving algorithm is not consulted.
 
-Some places don't follow the usual rules for daylight savings time.
-The state of Arizona, for example, does not observe daylight savings
+Some places don't follow the usual rules for daylight saving time.
+The state of Arizona, for example, does not observe daylight saving
 time.  If you run Calc during the winter season in Arizona, the
 Unix @code{date} command will report @code{MST} time zone, which
 Calc will change to @code{MGT}.  If you then convert a time that
 lies in the summer months, Calc will apply an incorrect daylight
-savings time adjustment.  To avoid this, set your @code{TimeZone}
+saving time adjustment.  To avoid this, set your @code{TimeZone}
 variable explicitly to @code{MST} to force the use of standard,
-non-daylight-savings time.
+non-daylight-saving time.
 
 @vindex math-daylight-savings-hook
 @findex math-std-daylight-savings
-By default Calc always considers daylight savings time to begin at
-2 a.m.@: on the first Sunday of April, and to end at 2 a.m.@: on the
-last Sunday of October.  This is the rule that has been in effect
-in North America since 1987.  If you are in a country that uses
-different rules for computing daylight savings time, you have two
-choices:  Write your own daylight savings hook, or control time
-zones explicitly by setting the @code{TimeZone} variable and/or
+By default Calc always considers daylight saving time to begin at
+2 a.m.@: on the second Sunday of March (for years from 2007 on) or on
+the last Sunday in April (for years before 2007), and to end at 2 a.m.@:
+on the first Sunday of November. (for years from 2007 on) or the last
+Sunday in October (for years before 2007).  These are the rules that have
+been in effect in much of North America since 1966 and takes into
+account the rule change that began in 2007.  If you are in a
+country that uses different rules for computing daylight saving time,
+you have two choices:  Write your own daylight saving hook, or control
+time zones explicitly by setting the @code{TimeZone} variable and/or
 always giving a time-zone argument for the conversion functions.
 
 The Lisp variable @code{math-daylight-savings-hook} holds the
-name of a function that is used to compute the daylight savings
+name of a function that is used to compute the daylight saving
 adjustment for a given date.  The default is
 @code{math-std-daylight-savings}, which computes an adjustment
 (either 0 or @mathit{-1}) using the North American rules given above.
 
-The daylight savings hook function is called with four arguments:
+The daylight saving hook function is called with four arguments:
 The date, as a floating-point number in standard Calc format;
 a six-element list of the date decomposed into year, month, day,
 hour, minute, and second, respectively; a string which contains
@@ -17525,18 +17529,18 @@ converting into a generalized time zone (see below).
 
 @findex math-prev-weekday-in-month
 The Lisp function @code{math-prev-weekday-in-month} is useful for
-daylight savings computations.  This is an internal version of
+daylight saving computations.  This is an internal version of
 the user-level @code{pwday} function described in the previous
 section. It takes four arguments:  The floating-point date value,
 the corresponding six-element date list, the day-of-month number,
 and the weekday number (0-6).
 
-The default daylight savings hook ignores the time zone name, but a
+The default daylight saving hook ignores the time zone name, but a
 more sophisticated hook could use different algorithms for different
 time zones.  It would also be possible to use different algorithms
 depending on the year number, but the default hook always uses the
 algorithm for 1987 and later.  Here is a listing of the default
-daylight savings hook:
+daylight saving hook:
 
 @smallexample
 (defun math-std-daylight-savings (date dt zone bump)
@@ -17566,25 +17570,25 @@ adjustments shown above ensure that the conversion behaves correctly
 and reasonably around the 2 a.m.@: transition in each direction.
 
 There is a ``missing'' hour between 2 a.m.@: and 3 a.m.@: at the
-beginning of daylight savings time; converting a date/time form that
+beginning of daylight saving time; converting a date/time form that
 falls in this hour results in a time value for the following hour,
-from 3 a.m.@: to 4 a.m.  At the end of daylight savings time, the
+from 3 a.m.@: to 4 a.m.  At the end of daylight saving time, the
 hour from 1 a.m.@: to 2 a.m.@: repeats itself; converting a date/time
 form that falls in this hour results in a time value for the first
 manifestation of that time (@emph{not} the one that occurs one hour later).
 
 If @code{math-daylight-savings-hook} is @code{nil}, then the
-daylight savings adjustment is always taken to be zero.
+daylight saving adjustment is always taken to be zero.
 
 In algebraic formulas, @samp{tzone(@var{zone}, @var{date})}
 computes the time zone adjustment for a given zone name at a
 given date.  The @var{date} is ignored unless @var{zone} is a
 generalized time zone.  If @var{date} is a date form, the
-daylight savings computation is applied to it as it appears.
+daylight saving computation is applied to it as it appears.
 If @var{date} is a numeric date value, it is adjusted for the
-daylight-savings version of @var{zone} before being given to
-the daylight savings hook.  This odd-sounding rule ensures
-that the daylight-savings computation is always done in
+daylight-saving version of @var{zone} before being given to
+the daylight saving hook.  This odd-sounding rule ensures
+that the daylight-saving computation is always done in
 local time, not in the GMT time that a numeric @var{date}
 is typically represented in.
 
@@ -17593,9 +17597,9 @@ is typically represented in.
 @end ignore
 @tindex dsadj
 The @samp{dsadj(@var{date}, @var{zone})} function computes the
-daylight savings adjustment that is appropriate for @var{date} in
+daylight saving adjustment that is appropriate for @var{date} in
 time zone @var{zone}.  If @var{zone} is explicitly in or not in
-daylight savings time (e.g., @code{PDT} or @code{PST}) the
+daylight saving time (e.g., @code{PDT} or @code{PST}) the
 @var{date} is ignored.  If @var{zone} is a generalized time zone,
 the algorithms described above are used.  If @var{zone} is omitted,
 the computation is done for the current time zone.
diff --git a/man/calendar.texi b/man/calendar.texi
index 812bde03b2f..11b24f7c210 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -43,7 +43,7 @@ about more specialized features.
 * Diary::               Displaying events from your diary.
 * Appointments::        Reminders when it's time to do something.
 * Importing Diary::     Converting diary events to/from other formats.
-* Daylight Savings::    How to specify when daylight savings time is active.
+* Daylight Saving::     How to specify when daylight saving time is active.
 * Time Intervals::      Keeping track of time intervals.
 @ifnottex
 * Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization.
@@ -604,8 +604,8 @@ Time (Greenwich time).  The values of
 @code{calendar-standard-time-zone-name} and
 @code{calendar-daylight-time-zone-name} are the abbreviations used in
 your time zone.  Emacs displays the times of sunrise and sunset
-@emph{corrected for daylight savings time}.  @xref{Daylight Savings},
-for how daylight savings time is determined.
+@emph{corrected for daylight saving time}.  @xref{Daylight Saving},
+for how daylight saving time is determined.
 
   As a user, you might find it convenient to set the calendar location
 variables for your usual physical location in your @file{.emacs} file.
@@ -646,9 +646,9 @@ month, use @kbd{C-u M-x phases-of-moon}, which prompts for the month and
 year.
 
   The dates and times given for the phases of the moon are given in
-local time (corrected for daylight savings, when appropriate); but if
+local time (corrected for daylight saving, when appropriate); but if
 the variable @code{calendar-time-zone} is void, Coordinated Universal
-Time (the Greenwich time zone) is used.  @xref{Daylight Savings}.
+Time (the Greenwich time zone) is used.  @xref{Daylight Saving}.
 
 @node Other Calendars
 @section Conversion To and From Other Calendars
@@ -1553,14 +1553,14 @@ Emacs diary file to iCalendar format.  To export only a part of a diary
 file, mark the relevant area, and call @code{icalendar-export-region}.
 In both cases the result is appended to the target file.
 
-@node Daylight Savings
-@section Daylight Savings Time
-@cindex daylight savings time
+@node Daylight Saving
+@section Daylight Saving Time
+@cindex daylight saving time
 
   Emacs understands the difference between standard time and daylight
-savings time---the times given for sunrise, sunset, solstices,
+saving time---the times given for sunrise, sunset, solstices,
 equinoxes, and the phases of the moon take that into account.  The rules
-for daylight savings time vary from place to place and have also varied
+for daylight saving time vary from place to place and have also varied
 historically from year to year.  To do the job properly, Emacs needs to
 know which rules to use.
 
@@ -1577,12 +1577,12 @@ you can tell Emacs the rules to use by setting certain variables:
 
   These values should be Lisp expressions that refer to the variable
 @code{year}, and evaluate to the Gregorian date on which daylight
-savings time starts or (respectively) ends, in the form of a list
+saving time starts or (respectively) ends, in the form of a list
 @code{(@var{month} @var{day} @var{year})}.  The values should be
-@code{nil} if your area does not use daylight savings time.
+@code{nil} if your area does not use daylight saving time.
 
   Emacs uses these expressions to determine the starting date of
-daylight savings time for the holiday list and for correcting times of
+daylight saving time for the holiday list and for correcting times of
 day in the solar and lunar calculations.
 
   The values for Cambridge, Massachusetts are as follows:
@@ -1595,7 +1595,7 @@ day in the solar and lunar calculations.
 @noindent
 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
+(November) of that year.  If daylight saving time were
 changed to start on October 1, you would set
 @code{calendar-daylight-savings-starts} to this:
 
@@ -1603,13 +1603,13 @@ changed to start on October 1, you would set
 (list 10 1 year)
 @end example
 
-  If there is no daylight savings time at your location, or if you want
+  If there is no daylight saving time at your location, or if you want
 all times in standard time, set @code{calendar-daylight-savings-starts}
 and @code{calendar-daylight-savings-ends} to @code{nil}.
 
 @vindex calendar-daylight-time-offset
   The variable @code{calendar-daylight-time-offset} specifies the
-difference between daylight savings time and standard time, measured in
+difference between daylight saving time and standard time, measured in
 minutes.  The value for Cambridge, Massachusetts is 60.
 
 @c @vindex calendar-daylight-savings-starts-time  too long!
@@ -1617,7 +1617,7 @@ minutes.  The value for Cambridge, Massachusetts is 60.
   The two variables @code{calendar-daylight-savings-starts-time} and
 @code{calendar-daylight-savings-ends-time} specify the number of minutes
 after midnight local time when the transition to and from daylight
-savings time should occur.  For Cambridge, Massachusetts both variables'
+saving time should occur.  For Cambridge, Massachusetts both variables'
 values are 120.
 
 @node Time Intervals
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 05b7df18b47..d3996eff5c7 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -6701,7 +6701,7 @@ this hack can degrade performance by about as much.  Thus this variable
 is set to @code{nil} by default, since the Emacs-friendly styles should
 be more common (and encouraged!).  Note that this variable has no effect
 in Emacs since the necessary built-in functions don't exist (in Emacs
-21.3 as of this writing in May 2003).
+22.1 as of this writing in February 2007).
 
 Text properties are used to speed up skipping over syntactic whitespace,
 i.e. comments and preprocessor directives.  Indenting a line after a
diff --git a/man/custom.texi b/man/custom.texi
index 40eefba1ba3..40a0f8d0b2c 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1247,7 +1247,7 @@ processes @code{eval} variables.  The three possibilities for the
 variable's value are @code{t}, @code{nil}, and anything else, just as
 for @code{enable-local-variables}.  The default is @code{maybe}, which
 is neither @code{t} nor @code{nil}, so normally Emacs does ask for
-confirmation about processes @code{eval} variables.
+confirmation about processing @code{eval} variables.
 
 @vindex safe-local-eval-forms
   But there is an exception.  The @code{safe-local-eval-forms} is a
diff --git a/man/emacs.texi b/man/emacs.texi
index 2aadc673248..39416158341 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.95
+@set EMACSVER  22.0.96
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -812,7 +812,7 @@ The Calendar and the Diary
 * Diary::               Displaying events from your diary.
 * Appointments::        Reminders when it's time to do something.
 * Importing Diary::     Converting diary events to/from other formats.
-* Daylight Savings::    How to specify when daylight savings time is active.
+* Daylight Saving::    How to specify when daylight saving time is active.
 * Time Intervals::      Keeping track of time intervals.
 * Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization.
 
diff --git a/man/eshell.texi b/man/eshell.texi
index 68ca49ee440..47f76a1d69a 100644
--- a/man/eshell.texi
+++ b/man/eshell.texi
@@ -474,8 +474,8 @@ find this package useful!
 @cindex known bugs
 @cindex bugs, known
 
-Below is complete list of known problems with Eshell version 2.4.1,
-which is the version included with Emacs 21.1.
+Below is complete list of known problems with Eshell version 2.4.2,
+which is the version included with Emacs 22.
 
 @table @asis
 @item Documentation incomplete
diff --git a/man/faq.texi b/man/faq.texi
index b800ffac69a..a8feffa46e4 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1147,39 +1147,40 @@ and on @code{xterm} with @kbd{emacs -nw}.
 @cindex Recently introduced features
 
 @cindex Default features
-Font Lock mode, auto-compression mode, and file name shadow mode are now
-enabled by default.  On graphics displays it is now possible to follow
-links with @kbd{mouse-1}, and the modeline of the selected window is now
-highlighted.  Window fringes are now customizable.  The minibuffer
-prompt is now displayed in a distinct face.
+Font Lock mode, auto-compression mode, and file name shadow mode are
+enabled by default.  On graphics displays it is possible to follow links
+with @kbd{mouse-1}.  The modeline of the selected window is now
+highlighted.  Window fringes are customizable.  The minibuffer prompt is
+displayed in a distinct face.
 
 Emacs now reads abbrev definitions automatically at startup.  The
-maximum size of buffers has been doubled and is now 256M on 32-bit
-machines.  Grep mode is now separate from Compilation mode and has many
-new specific options and commands.
+maximum size of buffers has been doubled and is 256M on 32-bit machines.
+Grep mode is separate from Compilation mode and has many new specific
+options and commands.
 
 The original Emacs macro system has been replaced by the new Kmacro
 package, which provides many new commands and features and a simple
-interface that uses the function keys F3 and F4.  Macros are now stored
+interface that uses the function keys F3 and F4.  Macros are stored
 in a macro ring, and can be debugged and edited interactively.
 
 The GUD (Grand Unified Debugger) package can now be used with a full
 graphical user interface to the debugger which provides many features
 found in traditional development environments, making it easy to
 manipulate breakpoints, add watch points, display the call stack, etc.
-Breakpoints are now displayed in the source buffer.
+Breakpoints are displayed in the source buffer.
 
 @cindex GTK+ Toolkit
 @cindex Drag-and-drop
 @cindex Mouse wheel
-Emacs can now be built with GTK+ widgets, and supports drag-and-drop
-operation on X.  Mouse wheel support is now enabled by default.
+Emacs can be built with GTK+ widgets, and supports drag-and-drop
+operation on X.  Mouse wheel support is enabled by default.
 
 @cindex New modes
-Many new modes and packages have been included in Emacs, such as Calc,
-Tramp and URL, as well as IDO, CUA, rcirc, ERC, conf-mode, python-mode,
-table, tumme, SES, ruler, Flymake, Org, PGG, wdired, t-mouse, longlines,
-dns-mode, savehist, Password, Printing, Reveal, etc.
+Many new modes and packages have been included in Emacs, such as MH-E,
+Calc, Tramp and URL, as well as IDO, CUA, rcirc, ERC, conf-mode,
+python-mode, table, tumme, SES, ruler, Flymake, Org, PGG, wdired,
+t-mouse, longlines, dns-mode, savehist, Password, Printing, Reveal, etc.
+Gnus has been updated to version 5.11.
 
 @cindex Multilingual Environment
 Leim is now part of Emacs.  Unicode support has been much improved, and
diff --git a/man/gnus.texi b/man/gnus.texi
index e2adfae2253..2ca1d225786 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -11799,12 +11799,12 @@ still a pain, though.
 @cindex User-Agent
 
 This variable controls which information should be exposed in the
-User-Agent header.  It can be one of the symbols @code{gnus} (show only
-Gnus version), @code{emacs-gnus} (show only Emacs and Gnus versions),
-@code{emacs-gnus-config} (same as @code{emacs-gnus} plus system
-configuration), @code{emacs-gnus-type} (same as @code{emacs-gnus} plus
-system type) or a custom string.  If you set it to a string, be sure to
-use a valid format, see RFC 2616.
+User-Agent header.  It can be a list of symbols or a string.  Valid
+symbols are @code{gnus} (show Gnus version) and @code{emacs} (show Emacs
+version).  In addition to the Emacs version, you can add @code{codename}
+(show (S)XEmacs codename) or either @code{config} (show system
+configuration) or @code{type} (show system type).  If you set it to a
+string, be sure to use a valid format, see RFC 2616.
 
 @end table
 
diff --git a/man/pgg.texi b/man/pgg.texi
index f1b031a37b7..a9d3f6e16de 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -272,7 +272,7 @@ tells @code{gpg-agent} use its own terminal to prompt for passphrases.
 
 When @code{gpg-agent} is not being used, PGG prompts for a passphrase
 through Emacs.  It also has its own passphrase caching mechanism,
-which is controlled by the variable @code{pgg-read-passphrase} (see
+which is controlled by the variable @code{pgg-cache-passphrase} (see
 below).
 
 There is a security risk in handling passphrases through PGG rather