Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 208)

   - Update from CVS

2007-03-11  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * texi/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>.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-301

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 722de6c..76cc4e7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+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-02-27  Chong Yidong  <cyd@stupidchicken.com>
 
        * pgg.texi (Caching passphrase): Document gpg-agent usage, gpg-agent

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 88fd4f8..9a63de6 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12004,12 +12004,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