X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=texi%2Fgnus.texi;h=d15d608c8aac84542f30b99178b1d303e3c09a59;hp=34fa45d642d7ecba5e7ff4b489812a319fa3280b;hb=20cab556e39a144d2c949804536eb08884a494ab;hpb=a629ef97108075cbae0b8b69b2dd1a4723a520c8

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 34fa45d64..d15d608c8 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,10 +1,13 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Quassia Gnus 0.26 Manual
+@settitle Gnus 5.6.33 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
+@c @direntry
+@c * Gnus: (gnus).         The news reader Gnus.
+@c @end direntry
 @iftex
 @finalout
 @end iftex
@@ -59,6 +62,8 @@
 \newcommand{\gnustilde}{\symbol{"7E}}
 \newcommand{\gnusless}{{$<$}}
 \newcommand{\gnusgreater}{{$>$}}
+\newcommand{\gnusbraceleft}{{$>$}}
+\newcommand{\gnusbraceright}{{$>$}}
 
 \newcommand{\gnushead}{\raisebox{-1cm}{\epsfig{figure=ps/gnus-head.eps,height=1cm}}}
 \newcommand{\gnusinteresting}{
@@ -178,7 +183,7 @@
 }
 {
 \ifodd\count0
-\mbox{} \hfill 
+\mbox{} \hfill
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
 \else
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
@@ -202,7 +207,7 @@
 }
 {
 \ifodd\count0
-\mbox{} \hfill 
+\mbox{} \hfill
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
 \else
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
@@ -226,7 +231,7 @@
 }
 {
 \ifodd\count0
-\mbox{} \hfill 
+\mbox{} \hfill
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
 \else
 \raisebox{-0.5cm}{\epsfig{figure=ps/gnus-big-logo.eps,height=1cm}}
@@ -265,7 +270,7 @@
 
 \thispagestyle{empty}
 
-Copyright \copyright{} 1995,96,97 Free Software Foundation, Inc. 
+Copyright \copyright{} 1995,96,97 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -313,13 +318,13 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Quassia Gnus 0.26 Manual
+@title Gnus 5.6.33 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995,96,97 Free Software Foundation, Inc. 
+Copyright @copyright{} 1995,96,97 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -349,7 +354,7 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local
 spool or your mbox file.  All at the same time, if you want to push your
 luck.
 
-This manual corresponds to Quassia Gnus 0.26.
+This manual corresponds to Gnus 5.6.33.
 
 @end ifinfo
 
@@ -361,7 +366,7 @@ This manual corresponds to Quassia Gnus 0.26.
 @end iflatex
 
 Gnus is the advanced, self-documenting, customizable, extensible
-unreal-time newsreader for GNU Emacs.  
+unreal-time newsreader for GNU Emacs.
 
 Oops.  That sounds oddly familiar, so let's start over again to avoid
 being accused of plagiarism:
@@ -404,7 +409,7 @@ the program.
 @findex gnus
 If your system administrator has set things up properly, starting Gnus
 and reading news is extremely easy---you just type @kbd{M-x gnus} in
-your Emacs. 
+your Emacs.
 
 @findex gnus-other-frame
 @kindex M-x gnus-other-frame
@@ -527,7 +532,7 @@ picked groups (i.e., @samp{*.newusers}).  (@dfn{Arbitrary} is defined
 here as @dfn{whatever Lars thinks you should read}.)
 
 You'll also be subscribed to the Gnus documentation group, which should
-help you with most common problems.  
+help you with most common problems.
 
 If @code{gnus-default-subscribed-newsgroups} is @code{t}, Gnus will just
 use the normal functions for handling new groups, and not do anything
@@ -641,7 +646,7 @@ cheaper.  This also means that you can get rid of the list of killed
 groups altogether, so you may set @code{gnus-save-killed-list} to
 @code{nil}, which will save time both at startup, at exit, and all over.
 Saves disk space, too.  Why isn't this the default, then?
-Unfortunately, not all servers support this command. 
+Unfortunately, not all servers support this command.
 
 I bet I know what you're thinking now: How do I find out whether my
 server supports @code{ask-server}?  No?  Good, because I don't have a
@@ -720,7 +725,7 @@ A closely related variable is
 mouthful.)  If this variable is non-@code{nil}, Gnus will ask you in a
 hierarchical fashion whether to subscribe to new groups or not.  Gnus
 will ask you for each sub-hierarchy whether you want to descend the
-hierarchy or not.  
+hierarchy or not.
 
 One common mistake is to set the variable a few paragraphs above
 (@code{gnus-subscribe-newsgroup-method}) to
@@ -779,10 +784,10 @@ New groups that match this regexp are subscribed using
 
 Sometimes it is necessary to move from one @sc{nntp} server to another.
 This happens very rarely, but perhaps you change jobs, or one server is
-very flaky and you want to use another.  
+very flaky and you want to use another.
 
 Changing the server is pretty easy, right?  You just change
-@code{gnus-select-method} to point to the new server?  
+@code{gnus-select-method} to point to the new server?
 
 @emph{Wrong!}
 
@@ -790,7 +795,7 @@ Article numbers are not (in any way) kept synchronized between different
 @sc{nntp} servers, and the only way Gnus keeps track of what articles
 you have read is by keeping track of article numbers.  So when you
 change @code{gnus-select-method}, your @file{.newsrc} file becomes
-worthless.  
+worthless.
 
 Gnus provides a few functions to attempt to translate a @file{.newsrc}
 file from one server to another.  They all have one thing in
@@ -847,7 +852,7 @@ not stored in the @file{.newsrc} file.
 @vindex gnus-save-newsrc-file
 You can turn off writing the @file{.newsrc} file by setting
 @code{gnus-save-newsrc-file} to @code{nil}, which means you can delete
-the file and save some space, as well as making exit from Gnus faster.
+the file and save some space, as well as exiting from Gnus faster.
 However, this will make it impossible to use other newsreaders than
 Gnus.  But hey, who would want to, right?
 
@@ -878,7 +883,7 @@ saving the @file{.newsrc.eld} file, and
 @code{gnus-save-standard-newsrc-hook} is called just before saving the
 @file{.newsrc} file.  The latter two are commonly used to turn version
 control on or off.  Version control is on by default when saving the
-startup files.  If you want to turn backup creation off, say something like: 
+startup files.  If you want to turn backup creation off, say something like:
 
 @lisp
 (defun turn-off-backup ()
@@ -928,6 +933,10 @@ into the directory where the @file{.newsrc} file is located.  (This is
 normally the user's home directory.)  The dribble file will get the same
 file permissions as the @code{.newsrc} file.
 
+@vindex gnus-always-read-dribble-file
+If @code{gnus-always-read-dribble-file} is non-@code{nil}, Gnus will
+read the dribble file on startup without querying the user.
+
 
 @node The Active File
 @section The Active File
@@ -962,7 +971,7 @@ you actually subscribe to.
 Note that if you subscribe to lots and lots of groups, setting this
 variable to @code{nil} will probably make Gnus slower, not faster.  At
 present, having this variable @code{nil} will slow Gnus down
-considerably, unless you read news over a 2400 baud modem.  
+considerably, unless you read news over a 2400 baud modem.
 
 This variable can also have the value @code{some}.  Gnus will then
 attempt to read active info only on the subscribed groups.  On some
@@ -1092,7 +1101,7 @@ long as Gnus is active.
 @node Group Buffer Format
 @section Group Buffer Format
 
-@menu 
+@menu
 * Group Line Specification::       Deciding how the group buffer is to look.
 * Group Modeline Specification::   The group buffer modeline.
 * Group Highlighting::             Having nice colors in the group buffer.
@@ -1125,7 +1134,7 @@ You can change that format to whatever you want by fiddling with the
 @code{gnus-group-line-format} variable.  This variable works along the
 lines of a @code{format} specification, which is pretty much the same as
 a @code{printf} specifications, for those of you who use (feh!) C.
-@xref{Formatting Variables}. 
+@xref{Formatting Variables}.
 
 @samp{%M%S%5y: %(%g%)\n} is the value that produced those lines above.
 
@@ -1143,13 +1152,13 @@ Here's a list of all available format characters:
 
 @table @samp
 
-@item M    
+@item M
 An asterisk if the group only has marked articles.
 
 @item S
 Whether the group is subscribed.
 
-@item L    
+@item L
 Level of subscribedness.
 
 @item N
@@ -1200,7 +1209,7 @@ A string that looks like @samp{<%s:%n>} if a foreign select method is
 used.
 
 @item P
-Indentation based on the level of the topic (@pxref{Group Topics}). 
+Indentation based on the level of the topic (@pxref{Group Topics}).
 
 @item c
 @vindex gnus-group-uncollapsed-levels
@@ -1217,7 +1226,7 @@ the group lately.
 
 @item d
 A string that says when you last read the group (@pxref{Group
-Timestamp}). 
+Timestamp}).
 
 @item u
 User defined specifier.  The next character in the format string should
@@ -1241,7 +1250,7 @@ group, or a bogus native group.
 
 @vindex gnus-group-mode-line-format
 The mode line can be changed by setting
-@code{gnus-group-mode-line-format} (@pxref{Formatting Variables}).  It
+@code{gnus-group-mode-line-format} (@pxref{Mode Line Formatting}).  It
 doesn't understand that many format specifiers:
 
 @table @samp
@@ -1267,29 +1276,23 @@ Here's an example value for this variable that might look nice if the
 background is dark:
 
 @lisp
-(face-spec-set 'my-group-face-1 '((t (:foreground "Red" :bold t))))
-(face-spec-set 'my-group-face-2 '((t (:foreground "SeaGreen" :bold t))))
-(face-spec-set 'my-group-face-3 '((t (:foreground "SpringGreen" :bold t))))
-(face-spec-set 'my-group-face-4 '((t (:foreground "SteelBlue" :bold t))))
-(face-spec-set 'my-group-face-5 '((t (:foreground "SkyBlue" :bold t))))
+(face-spec-set 'my-group-face-1
+               '((t (:foreground "Red" :bold t))))
+(face-spec-set 'my-group-face-2
+               '((t (:foreground "SeaGreen" :bold t))))
+(face-spec-set 'my-group-face-3
+               '((t (:foreground "SpringGreen" :bold t))))
+(face-spec-set 'my-group-face-4
+               '((t (:foreground "SteelBlue" :bold t))))
+(face-spec-set 'my-group-face-5
+               '((t (:foreground "SkyBlue" :bold t))))
 
 (setq gnus-group-highlight
       '(((> unread 200) . my-group-face-1)
-	((and (< level 3) (zerop unread)) . my-group-face-2)
-	((< level 3) . my-group-face-3)
-	((zerop unread) . my-group-face-4)
-(setq gnus-group-highlight
-      `(((> unread 200) . 
-         ,(custom-face-lookup "Red" nil nil t nil nil))
-        ((and (< level 3) (zerop unread)) . 
-         ,(custom-face-lookup "SeaGreen" nil nil t nil nil))
-        ((< level 3) . 
-         ,(custom-face-lookup "SpringGreen" nil nil t nil nil))
-        ((zerop unread) . 
-         ,(custom-face-lookup "SteelBlue" nil nil t nil nil))
-        (t . 
-         ,(custom-face-lookup "SkyBlue" nil nil t nil nil))))
-	(t . my-group-face-5)))
+        ((and (< level 3) (zerop unread)) . my-group-face-2)
+        ((< level 3) . my-group-face-3)
+        ((zerop unread) . my-group-face-4)
+        (t . my-group-face-5)))
 @end lisp
 
 Also @pxref{Faces and Fonts}.
@@ -1310,7 +1313,7 @@ Whether the group is a mail group.
 The level of the group.
 @item score
 The score of the group.
-@item ticked 
+@item ticked
 The number of ticked articles in the group.
 @item total
 The total number of articles in the group.  Or rather, MAX-NUMBER minus
@@ -1336,7 +1339,7 @@ calls @code{gnus-group-highlight-line} by default.
 @cindex group movement
 
 All movement commands understand the numeric prefix and will behave as
-expected, hopefully. 
+expected, hopefully.
 
 @table @kbd
 
@@ -1364,17 +1367,17 @@ Go to the next group (@code{gnus-group-next-group}).
 @findex gnus-group-prev-group
 Go to the previous group (@code{gnus-group-prev-group}).
 
-@item M-p
-@kindex M-p (Group)
+@item M-n
+@kindex M-n (Group)
 @findex gnus-group-next-unread-group-same-level
 Go to the next unread group on the same (or lower) level
-(@code{gnus-group-next-unread-group-same-level}). 
+(@code{gnus-group-next-unread-group-same-level}).
 
-@item M-n
-@kindex M-n (Group)
+@item M-p
+@kindex M-p (Group)
 @findex gnus-group-prev-unread-group-same-level
 Go to the previous unread group on the same (or lower) level
-(@code{gnus-group-prev-unread-group-same-level}). 
+(@code{gnus-group-prev-unread-group-same-level}).
 @end table
 
 Three commands for jumping to groups:
@@ -1392,13 +1395,13 @@ like living groups.
 @kindex , (Group)
 @findex gnus-group-best-unread-group
 Jump to the unread group with the lowest level
-(@code{gnus-group-best-unread-group}). 
+(@code{gnus-group-best-unread-group}).
 
 @item .
 @kindex . (Group)
 @findex gnus-group-first-unread-group
 Jump to the first group with unread articles
-(@code{gnus-group-first-unread-group}).  
+(@code{gnus-group-first-unread-group}).
 @end table
 
 @vindex gnus-group-goto-unread
@@ -1433,7 +1436,7 @@ Select the current group and switch to the summary buffer
 (@code{gnus-group-select-group}).  Takes the same arguments as
 @code{gnus-group-read-group}---the only difference is that this command
 does not display the first unread article automatically upon group
-entry. 
+entry.
 
 @item M-RET
 @kindex M-RET (Group)
@@ -1487,13 +1490,13 @@ Don't select any articles when entering the group.  Just display the
 full summary buffer.
 
 @item t
-Select the first unread article when entering the group.  
+Select the first unread article when entering the group.
 
 @item best
-Select the most high-scored article in the group when entering the
-group. 
+Select the highest scored article in the group when entering the
+group.
 @end table
-        
+
 If you want to prevent automatic selection in some group (say, in a
 binary group with Huge articles) you can set this variable to @code{nil}
 in @code{gnus-select-group-hook}, which is called when a group is
@@ -1513,7 +1516,7 @@ selected.
 @findex gnus-group-unsubscribe-current-group
 @c @icon{gnus-group-unsubscribe}
 Toggle subscription to the current group
-(@code{gnus-group-unsubscribe-current-group}).  
+(@code{gnus-group-unsubscribe-current-group}).
 
 @item S s
 @itemx U
@@ -1551,7 +1554,7 @@ kill-and-yank sequence sometimes.
 @kindex S w (Group)
 @kindex C-w (Group)
 @findex gnus-group-kill-region
-Kill all groups in the region (@code{gnus-group-kill-region}). 
+Kill all groups in the region (@code{gnus-group-kill-region}).
 
 @item S z
 @kindex S z (Group)
@@ -1567,7 +1570,7 @@ be used with some caution.  The only time where this command comes in
 really handy is when you have a @file{.newsrc} with lots of unsubscribed
 groups that you want to get rid off.  @kbd{S C-k} on level 7 will
 kill off all unsubscribed groups that do not have message numbers in the
-@file{.newsrc} file.  
+@file{.newsrc} file.
 
 @end table
 
@@ -1593,7 +1596,7 @@ the group buffer.
 @kindex C (Group)
 @findex gnus-group-catchup-current-all
 Mark all articles in this group, even the ticked ones, as read
-(@code{gnus-group-catchup-current-all}).   
+(@code{gnus-group-catchup-current-all}).
 
 @item M-c
 @kindex M-c (Group)
@@ -1607,7 +1610,7 @@ read articles (@code{gnus-group-clear-data}).
 If you have switched from one @sc{nntp} server to another, all your marks
 and read ranges have become worthless.  You can use this command to
 clear out all data that you have on your native groups.  Use with
-caution. 
+caution.
 
 @end table
 
@@ -1623,7 +1626,7 @@ can ask Gnus to just list groups on a given level or lower
 (@pxref{Listing Groups}), or to just check for new articles in groups on
 a given level or lower (@pxref{Scanning New Messages}).
 
-Remember:  The higher the level of the group, the less important it is. 
+Remember:  The higher the level of the group, the less important it is.
 
 @table @kbd
 
@@ -1683,7 +1686,7 @@ by default.
 If @code{gnus-group-list-inactive-groups} is non-@code{nil}, non-active
 groups will be listed along with the unread groups.  This variable is
 @code{t} by default.  If it is @code{nil}, inactive groups won't be
-listed. 
+listed.
 
 @vindex gnus-group-use-permanent-levels
 If @code{gnus-group-use-permanent-levels} is non-@code{nil}, once you
@@ -1706,7 +1709,7 @@ to 5.  The default is 6.
 You would normally keep important groups on high levels, but that scheme
 is somewhat restrictive.  Don't you wish you could have Gnus sort the
 group buffer according to how often you read groups, perhaps?  Within
-reason?  
+reason?
 
 This is what @dfn{group score} is for.  You can assign a score to each
 group.  You can then sort the group buffer based on this score.
@@ -1747,7 +1750,7 @@ with the process mark and then execute the command.
 @itemx M m
 @kindex M m (Group)
 @findex gnus-group-mark-group
-Set the mark on the current group (@code{gnus-group-mark-group}). 
+Set the mark on the current group (@code{gnus-group-mark-group}).
 
 @item M-#
 @kindex M-# (Group)
@@ -1755,28 +1758,28 @@ Set the mark on the current group (@code{gnus-group-mark-group}).
 @kindex M u (Group)
 @findex gnus-group-unmark-group
 Remove the mark from the current group
-(@code{gnus-group-unmark-group}). 
+(@code{gnus-group-unmark-group}).
 
 @item M U
 @kindex M U (Group)
 @findex gnus-group-unmark-all-groups
-Remove the mark from all groups (@code{gnus-group-unmark-all-groups}). 
+Remove the mark from all groups (@code{gnus-group-unmark-all-groups}).
 
 @item M w
 @kindex M w (Group)
 @findex gnus-group-mark-region
-Mark all groups between point and mark (@code{gnus-group-mark-region}). 
+Mark all groups between point and mark (@code{gnus-group-mark-region}).
 
 @item M b
 @kindex M b (Group)
 @findex gnus-group-mark-buffer
-Mark all groups in the buffer (@code{gnus-group-mark-buffer}). 
+Mark all groups in the buffer (@code{gnus-group-mark-buffer}).
 
 @item M r
 @kindex M r (Group)
 @findex gnus-group-mark-regexp
 Mark all groups that match some regular expression
-(@code{gnus-group-mark-regexp}).  
+(@code{gnus-group-mark-regexp}).
 @end table
 
 Also @pxref{Process/Prefix}.
@@ -1834,7 +1837,7 @@ group (@code{gnus-group-edit-group-method}).
 @kindex G p (Group)
 @findex gnus-group-edit-group-parameters
 Enter a buffer where you can edit the group parameters
-(@code{gnus-group-edit-group-parameters}). 
+(@code{gnus-group-edit-group-parameters}).
 
 @item G E
 @kindex G E (Group)
@@ -1849,7 +1852,7 @@ Enter a buffer where you can edit the group info
 Make a directory group (@pxref{Directory Groups}).  You will be prompted
 for a directory name (@code{gnus-group-make-directory-group}).
 
-@item G h 
+@item G h
 @kindex G h (Group)
 @cindex help group
 @findex gnus-group-make-help-group
@@ -1882,7 +1885,7 @@ strings to match on headers (@code{gnus-group-make-kiboze-group}).
 @cindex nneething
 Read an arbitrary directory as if it were a newsgroup with the
 @code{nneething} backend (@code{gnus-group-enter-directory}).
-@xref{Anything Groups}. 
+@xref{Anything Groups}.
 
 @item G f
 @kindex G f (Group)
@@ -1912,6 +1915,10 @@ search engine type and the search string.  Valid search engine types
 include @code{dejanews}, @code{altavista} and @code{reference}.
 @xref{Web Searches}.
 
+If you use the @code{dejanews} search engine, you can limit the search
+to a particular group by using a match string like
+@samp{~g alt.sysadmin.recovery shaving}.
+
 @item G DEL
 @kindex G DEL (Group)
 @findex gnus-group-delete-group
@@ -1936,47 +1943,75 @@ Add the current group to an @code{nnvirtual} group
 @end table
 
 @xref{Select Methods} for more information on the various select
-methods. 
+methods.
 
 @vindex gnus-activate-foreign-newsgroups
 If @code{gnus-activate-foreign-newsgroups} is a positive number,
 Gnus will check all foreign groups with this level or lower at startup.
 This might take quite a while, especially if you subscribe to lots of
-groups from different @sc{nntp} servers.
+groups from different @sc{nntp} servers.  Also @pxref{Group Levels};
+@code{gnus-activate-level} also affects activation of foreign
+newsgroups. 
 
 
 @node Group Parameters
 @section Group Parameters
 @cindex group parameters
 
-The group parameters store information local to a particular group:
+The group parameters store information local to a particular group.
+Here's an example group parameter list:
+
+@example
+((to-address . "ding@@gnus.org")
+ (auto-expire . t))
+@end example
+
+We see that each element consists of a "dotted pair"---the thing before
+the dot is the key, while the thing after the dot is the value.  All the
+parameters have this form @emph{except} local variable specs, which are
+not dotted pairs, but proper lists.
+
+The following group parameters can be used:
 
 @table @code
 @item to-address
 @cindex to-address
-If the group parameter list contains an element that looks like
-@code{(to-address .  "some@@where.com")}, that address will be used by
-the backend when doing followups and posts.  This is primarily useful in
-mail groups that represent closed mailing lists---mailing lists where
-it's expected that everybody that writes to the mailing list is
-subscribed to it.  Since using this parameter ensures that the mail only
-goes to the mailing list itself, it means that members won't receive two
-copies of your followups.
+Address used by when doing followups and new posts.
+
+@example
+(to-address .  "some@@where.com")
+@end example
+
+This is primarily useful in mail groups that represent closed mailing
+lists---mailing lists where it's expected that everybody that writes to
+the mailing list is subscribed to it.  Since using this parameter
+ensures that the mail only goes to the mailing list itself, it means
+that members won't receive two copies of your followups.
 
 Using @code{to-address} will actually work whether the group is foreign
 or not.  Let's say there's a group on the server that is called
 @samp{fa.4ad-l}.  This is a real newsgroup, but the server has gotten
 the articles from a mail-to-news gateway.  Posting directly to this
 group is therefore impossible---you have to send mail to the mailing
-list address instead. 
+list address instead.
 
 @item to-list
 @cindex to-list
-If the group parameter list has an element that looks like
-@code{(to-list . "some@@where.com")}, that address will be used when
-doing a @kbd{a} in that group.  It is totally ignored when doing a
-followup---except that if it is present in a news group, you'll get mail
-group semantics when doing @kbd{f}.
+Address used when doing a @kbd{a} in that group.
+
+@example
+(to-list . "some@@where.com")
+@end example
+
+It is totally ignored
+when doing a followup---except that if it is present in a news group,
+you'll get mail group semantics when doing @kbd{f}.
+
+If you do an @kbd{a} command in a mail group and you have neither a
+@code{to-list} group parameter nor a @code{to-address} group parameter,
+then a @code{to-list} group parameter will be added automatically upon
+sending the message if @code{gnus-add-to-list} is set to @code{t}.
+@vindex gnus-add-to-list
 
 If you do an @kbd{a} command in a mail group and you don't have a
 @code{to-list} group parameter, one will be added automatically upon
@@ -1999,23 +2034,24 @@ broken behavior.  So there!
 @item to-group
 @cindex to-group
 Elements like @code{(to-group . "some.group.name")} means that all
-posts in that group will be sent to @code{some.group.name}.  
+posts in that group will be sent to @code{some.group.name}.
 
 @item newsgroup
 @cindex newsgroup
-If this symbol is present in the group parameter list, Gnus will treat
-all responses as if they were responses to news articles.  This can be
-useful if you have a mail group that's really a mirror of a news group. 
+If you have @code{(newsgroup . t)} in the group parameter list, Gnus
+will treat all responses as if they were responses to news articles.
+This can be useful if you have a mail group that's really a mirror of a
+news group.
 
 @item gcc-self
 @cindex gcc-self
-If this symbol is present in the group parameter list and set to
-@code{t}, newly composed messages will be @code{Gcc}'d to the current
-group. If it is present and set to @code{none}, no @code{Gcc:} header
-will be generated, if it is present and a string, this string will be
-inserted literally as a @code{gcc} header (this symbol takes precedence
-over any default @code{Gcc} rules as described later).  @xref{Archived
-Messages}
+If @code{(gcc-self . t)} is present in the group parameter list, newly
+composed messages will be @code{Gcc}'d to the current group. If
+@code{(gcc-self . none)} is present, no @code{Gcc:} header will be
+generated, if @code{(gcc-self . "string")} is present, this string will
+be inserted literally as a @code{gcc} header.  This parameter takes
+precedence over any default @code{Gcc} rules as described later
+(@pxref{Archived Messages}).
 
 @item auto-expire
 @cindex auto-expire
@@ -2043,8 +2079,8 @@ the symbols @code{never} or @code{immediate}.
 @item score-file
 @cindex score file group parameter
 Elements that look like @code{(score-file . "file")} will make
-@file{file} into the current adaptive score file for the group in
-question.  All adaptive score entries will be put into this file.
+@file{file} into the current score file for the group in question.  All
+interactive score entries will be put into this file.
 
 @item adapt-file
 @cindex adapt file group parameter
@@ -2075,7 +2111,7 @@ ticked articles.
 Elements that look like @code{(comment . "This is a comment")}
 are arbitrary comments on the group.  They are currently ignored by
 Gnus, but provide a place for you to store information on particular
-groups. 
+groups.
 
 @item @var{(variable form)}
 You can use the group parameters to set variables local to the group you
@@ -2093,16 +2129,9 @@ group.  @code{dummy-variable} will be set to the result of the
 
 @end table
 
-Use the @kbd{G p} command to edit group parameters of a group.
-
-@pxref{Topic Parameters}.
-
-Here's an example group parameter list:
-
-@example
-((to-address . "ding@@gnus.org")
- (auto-expiry . t))
-@end example
+Use the @kbd{G p} command to edit group parameters of a group.  You
+might also be interested in reading about topic parameters (@pxref{Topic
+Parameters}).
 
 
 @node Listing Groups
@@ -2160,7 +2189,7 @@ List all zombie groups (@code{gnus-group-list-zombies}).
 @kindex A m (Group)
 @findex gnus-group-list-matching
 List all unread, subscribed groups with names that match a regexp
-(@code{gnus-group-list-matching}). 
+(@code{gnus-group-list-matching}).
 
 @item A M
 @kindex A M (Group)
@@ -2216,7 +2245,7 @@ groups.  It is @code{t} by default.
 The @kbd{C-c C-s} (@code{gnus-group-sort-groups}) command sorts the
 group buffer according to the function(s) given by the
 @code{gnus-group-sort-function} variable.  Available sorting functions
-include: 
+include:
 
 @table @code
 
@@ -2265,7 +2294,7 @@ some sorting criteria:
 @kindex G S a (Group)
 @findex gnus-group-sort-groups-by-alphabet
 Sort the group buffer alphabetically by group name
-(@code{gnus-group-sort-groups-by-alphabet}). 
+(@code{gnus-group-sort-groups-by-alphabet}).
 
 @item G S u
 @kindex G S u (Group)
@@ -2277,7 +2306,7 @@ Sort the group buffer by the number of unread articles
 @kindex G S l (Group)
 @findex gnus-group-sort-groups-by-level
 Sort the group buffer by group level
-(@code{gnus-group-sort-groups-by-level}). 
+(@code{gnus-group-sort-groups-by-level}).
 
 @item G S v
 @kindex G S v (Group)
@@ -2295,11 +2324,11 @@ Sort the group buffer by group rank
 @kindex G S m (Group)
 @findex gnus-group-sort-groups-by-method
 Sort the group buffer alphabetically by backend name
-(@code{gnus-group-sort-groups-by-method}). 
+(@code{gnus-group-sort-groups-by-method}).
 
 @end table
 
-When given a prefix, all these commands will sort in reverse order. 
+When given a prefix, all these commands will sort in reverse order.
 
 You can also sort a subset of the groups:
 
@@ -2359,8 +2388,10 @@ Find bogus groups and delete them
 @kindex F (Group)
 @findex gnus-group-find-new-groups
 Find new groups and process them (@code{gnus-group-find-new-groups}).
-If given a prefix, use the @code{ask-server} method to query the server
-for new groups.
+With 1 @kbd{C-u}, use the @code{ask-server} method to query the server
+for new groups.  With 2 @kbd{C-u}'s, use most complete method possible
+to query the server for new groups, and subscribe the new groups as
+zombies.
 
 @item C-c C-x
 @kindex C-c C-x (Group)
@@ -2413,18 +2444,18 @@ Go to the previous group (@code{gnus-group-prev-group}).
 @kindex SPACE (Browse)
 @findex gnus-browse-read-group
 Enter the current group and display the first article
-(@code{gnus-browse-read-group}). 
+(@code{gnus-browse-read-group}).
 
 @item RET
 @kindex RET (Browse)
 @findex gnus-browse-select-group
-Enter the current group (@code{gnus-browse-select-group}). 
+Enter the current group (@code{gnus-browse-select-group}).
 
 @item u
 @kindex u (Browse)
 @findex gnus-browse-unsubscribe-current-group
 Unsubscribe to the current group, or, as will be the case here,
-subscribe to it (@code{gnus-browse-unsubscribe-current-group}). 
+subscribe to it (@code{gnus-browse-unsubscribe-current-group}).
 
 @item l
 @itemx q
@@ -2544,7 +2575,7 @@ the hook for the group mode:
 (add-hook 'gnus-group-mode-hook 'gnus-topic-mode)
 @end lisp
 
-@menu 
+@menu
 * Topic Variables::    How to customize the topics the Lisp Way.
 * Topic Commands::     Interactive E-Z commands.
 * Topic Sorting::      Sorting each topic individually.
@@ -2578,8 +2609,8 @@ Level.
 Number of groups in the topic.
 @item a
 Number of unread articles in the topic.
-@item A 
-Number of unread articles in the topic and all its subtopics. 
+@item A
+Number of unread articles in the topic and all its subtopics.
 @end table
 
 @vindex gnus-topic-indent-level
@@ -2588,7 +2619,7 @@ Each sub-topic (and the groups in the sub-topics) will be indented with
 The default is 2.
 
 @vindex gnus-topic-mode-hook
-@code{gnus-topic-mode-hook} is called in topic minor mode buffers. 
+@code{gnus-topic-mode-hook} is called in topic minor mode buffers.
 
 @vindex gnus-topic-display-empty-topics
 The @code{gnus-topic-display-empty-topics} says whether to display even
@@ -2608,8 +2639,8 @@ definitions slightly.
 @item T n
 @kindex T n (Topic)
 @findex gnus-topic-create-topic
-Prompt for a new topic name and create it 
-(@code{gnus-topic-create-topic}). 
+Prompt for a new topic name and create it
+(@code{gnus-topic-create-topic}).
 
 @item T m
 @kindex T m (Topic)
@@ -2629,6 +2660,13 @@ convention (@pxref{Process/Prefix}).
 @kindex T D (Topic)
 @findex gnus-topic-remove-group
 Remove a group from the current topic (@code{gnus-topic-remove-group}).
+This command is mainly useful if you have the same group in several
+topics and wish to remove it from one of the topics.  You may also
+remove a group from all topics, but in that case, Gnus will add it to
+the root topic the next time you start Gnus.  In fact, all new groups
+(which, naturally, don't belong to any topic) will show up in the root
+topic. 
+
 This command uses the process/prefix convention
 (@pxref{Process/Prefix}).
 
@@ -2636,31 +2674,31 @@ This command uses the process/prefix convention
 @kindex T M (Topic)
 @findex gnus-topic-move-matching
 Move all groups that match some regular expression to a topic
-(@code{gnus-topic-move-matching}). 
+(@code{gnus-topic-move-matching}).
 
 @item T C
 @kindex T C (Topic)
 @findex gnus-topic-copy-matching
 Copy all groups that match some regular expression to a topic
-(@code{gnus-topic-copy-matching}). 
+(@code{gnus-topic-copy-matching}).
 
-@item T h
-@kindex T h (Topic)
+@item T H
+@kindex T H (Topic)
 @findex gnus-topic-toggle-display-empty-topics
 Toggle hiding empty topics
-(@code{gnus-topic-toggle-display-empty-topics}). 
+(@code{gnus-topic-toggle-display-empty-topics}).
 
 @item T #
 @kindex T # (Topic)
 @findex gnus-topic-mark-topic
 Mark all groups in the current topic with the process mark
-(@code{gnus-topic-mark-topic}). 
+(@code{gnus-topic-mark-topic}).
 
 @item T M-#
 @kindex T M-# (Topic)
 @findex gnus-topic-unmark-topic
 Remove the process mark from all groups in the current topic
-(@code{gnus-topic-unmark-topic}). 
+(@code{gnus-topic-unmark-topic}).
 
 @item RET
 @kindex RET (Topic)
@@ -2674,12 +2712,20 @@ toggling command on topics.  In addition, if you give a numerical
 prefix, group on that level (and lower) will be displayed.
 
 @item T TAB
+@itemx TAB
 @kindex T TAB (Topic)
+@kindex TAB (Topic)
 @findex gnus-topic-indent
 ``Indent'' the current topic so that it becomes a sub-topic of the
 previous topic (@code{gnus-topic-indent}).  If given a prefix,
 ``un-indent'' the topic instead.
 
+@item M-TAB
+@kindex M-TAB (Topic)
+@findex gnus-topic-unindent
+``Un-indent'' the current topic so that it becomes a sub-topic of the
+parent of its current parent (@code{gnus-topic-unindent}).  
+
 @item C-k
 @kindex C-k (Topic)
 @findex gnus-topic-kill-group
@@ -2691,17 +2737,17 @@ topic will be removed along with the topic.
 @findex gnus-topic-yank-group
 Yank the previously killed group or topic
 (@code{gnus-topic-yank-group}).  Note that all topics will be yanked
-before all groups. 
+before all groups.
 
 @item T r
 @kindex T r (Topic)
 @findex gnus-topic-rename
-Rename a topic (@code{gnus-topic-rename}). 
+Rename a topic (@code{gnus-topic-rename}).
 
 @item T DEL
 @kindex T DEL (Topic)
 @findex gnus-topic-delete
-Delete an empty topic (@code{gnus-topic-delete}). 
+Delete an empty topic (@code{gnus-topic-delete}).
 
 @item A T
 @kindex A T (Topic)
@@ -2726,7 +2772,7 @@ Edit the topic parameters (@code{gnus-topic-edit-parameters}).
 @cindex topic sorting
 
 You can sort the groups in each topic individually with the following
-commands: 
+commands:
 
 
 @table @kbd
@@ -2734,7 +2780,7 @@ commands:
 @kindex T S a (Topic)
 @findex gnus-topic-sort-groups-by-alphabet
 Sort the current topic alphabetically by group name
-(@code{gnus-topic-sort-groups-by-alphabet}). 
+(@code{gnus-topic-sort-groups-by-alphabet}).
 
 @item T S u
 @kindex T S u (Topic)
@@ -2746,7 +2792,7 @@ Sort the current topic by the number of unread articles
 @kindex T S l (Topic)
 @findex gnus-topic-sort-groups-by-level
 Sort the current topic by group level
-(@code{gnus-topic-sort-groups-by-level}). 
+(@code{gnus-topic-sort-groups-by-level}).
 
 @item T S v
 @kindex T S v (Topic)
@@ -2764,11 +2810,11 @@ Sort the current topic by group rank
 @kindex T S m (Topic)
 @findex gnus-topic-sort-groups-by-method
 Sort the current topic alphabetically by backend name
-(@code{gnus-topic-sort-groups-by-method}). 
+(@code{gnus-topic-sort-groups-by-method}).
 
 @end table
 
-@xref{Sorting Groups} for more information about group sorting. 
+@xref{Sorting Groups} for more information about group sorting.
 
 
 @node Topic Topology
@@ -2798,7 +2844,7 @@ follows:
 
 @lisp
 (("Gnus" visible)
- (("Emacs -- I wuw it!" visible) 
+ (("Emacs -- I wuw it!" visible)
   (("Naughty Emacs" visible)))
  (("Misc" visible)))
 @end lisp
@@ -2808,7 +2854,7 @@ This is in fact how the variable @code{gnus-topic-topology} would look
 for the display above.  That variable is saved in the @file{.newsrc.eld}
 file, and shouldn't be messed with manually---unless you really want
 to.  Since this variable is read from the @file{.newsrc.eld} file,
-setting it in any other startup files will have no effect.  
+setting it in any other startup files will have no effect.
 
 This topology shows what topics are sub-topics of what topics (right),
 and which topics are visible.  Two settings are currently
@@ -2821,7 +2867,7 @@ allowed---@code{visible} and @code{invisible}.
 
 All groups in a topic will inherit group parameters from the parent (and
 ancestor) topic parameters.  All valid group parameters are valid topic
-parameters (@pxref{Group Parameters}).  
+parameters (@pxref{Group Parameters}).
 
 Group parameters (of course) override topic parameters, and topic
 parameters in sub-topics override topic parameters in super-topics.  You
@@ -2847,7 +2893,7 @@ The @samp{Emacs} topic has the topic parameter @code{(score-file
 . "emacs.SCORE")}; the @samp{Relief} topic has the topic parameter
 @code{(score-file . "relief.SCORE")}; and the @samp{Misc} topic has the
 topic parameter @code{(score-file . "emacs.SCORE")}.  In addition,
-@samp{alt.religion.emacs} has the group parameter @code{(score-file
+@* @samp{alt.religion.emacs} has the group parameter @code{(score-file
 . "religion.SCORE")}.
 
 Now, when you enter @samp{alt.sex.emacs} in the @samp{Relief} topic, you
@@ -2904,7 +2950,7 @@ Variables for the group buffer:
 @item gnus-group-mode-hook
 @vindex gnus-group-mode-hook
 is called after the group buffer has been
-created. 
+created.
 
 @item gnus-group-prepare-hook
 @vindex gnus-group-prepare-hook
@@ -2956,7 +3002,7 @@ to move point to the next group or not.  It is @code{t} by default.
 @cindex activating groups
 @item C-c M-g
 @kindex C-c M-g (Group)
-Activate absolutely all groups (@code{gnus-activate-all-groups}). 
+Activate absolutely all groups (@code{gnus-activate-all-groups}).
 
 @item R
 @kindex R (Group)
@@ -2969,7 +3015,7 @@ Gnus variables, and then starts Gnus all over again.
 @end table
 
 @vindex gnus-get-new-news-hook
-@code{gnus-get-new-news-hook} is run just before checking for new news. 
+@code{gnus-get-new-news-hook} is run just before checking for new news.
 
 @vindex gnus-after-getting-new-news-hook
 @code{gnus-after-getting-new-news-hook} is run after checking for new
@@ -3059,7 +3105,7 @@ This information can be displayed in various ways---the easiest is to
 use the @samp{%d} spec in the group line format:
 
 @lisp
-(setq gnus-group-line-format 
+(setq gnus-group-line-format
       "%M\%S\%p\%P\%5y: %(%-40,40g%) %d\n")
 @end lisp
 
@@ -3075,7 +3121,7 @@ may be a bit too much, so to just display the date, you could say
 something like:
 
 @lisp
-(setq gnus-group-line-format 
+(setq gnus-group-line-format
       "%M\%S\%p\%P\%5y: %(%-40,40g%) %6,6~(cut 2)d\n")
 @end lisp
 
@@ -3118,7 +3164,7 @@ A line for each article is displayed in the summary buffer.  You can
 move around, read articles, post articles and reply to articles.
 
 The most common way to a summary buffer is to select a group from the
-group buffer (@pxref{Selecting a Group}).  
+group buffer (@pxref{Selecting a Group}).
 
 You can have as many summary buffers open as you wish.
 
@@ -3204,7 +3250,7 @@ The default string is @samp{%U%R%z%I%(%[%4L: %-20,20n%]%) %s\n}.
 The following format specification characters are understood:
 
 @table @samp
-@item N 
+@item N
 Article number.
 @item S
 Subject string.
@@ -3245,15 +3291,19 @@ One space for each thread level.
 Twenty minus thread level spaces.
 @item U
 Unread.
+
 @item R
-Replied.
+This misleadingly named specifier is the @dfn{secondary mark}.  This
+mark will say whether the article has been replied to, has been cached,
+or has been saved.  
+
 @item i
 Score as a number (@pxref{Scoring}).
 @item z
 @vindex gnus-summary-zcore-fuzz
 Zcore, @samp{+} if above the default level and @samp{-} if below the
 default level.  If the difference between
-@code{gnus-summary-default-level} and the score is less than
+@code{gnus-summary-default-score} and the score is less than
 @code{gnus-summary-zcore-fuzz}, this spec will not be used.
 @item V
 Total thread score.
@@ -3305,9 +3355,9 @@ This restriction may disappear in later versions of Gnus.
 @subsection Summary Buffer Mode Line
 
 @vindex gnus-summary-mode-line-format
-You can also change the format of the summary mode bar.  Set
-@code{gnus-summary-mode-line-format} to whatever you like.  The default
-is @samp{Gnus: %%b [%A] %Z}.  
+You can also change the format of the summary mode bar (@pxref{Mode Line
+Formatting}).  Set @code{gnus-summary-mode-line-format} to whatever you
+like.  The default is @samp{Gnus: %%b [%A] %Z}.
 
 Here are the elements you can play with:
 
@@ -3318,6 +3368,8 @@ Group name.
 Unprefixed group name.
 @item A
 Current article number.
+@item z
+Current article score.
 @item V
 Gnus version.
 @item U
@@ -3332,7 +3384,7 @@ articles, and just as @samp{<%U more>} if there are just unread articles
 and no unselected ones.
 @item g
 Shortish group name.  For instance, @samp{rec.arts.anime} will be
-shortened to @samp{r.a.anime}. 
+shortened to @samp{r.a.anime}.
 @item S
 Subject of the current article.
 @item u
@@ -3344,7 +3396,7 @@ Number of dormant articles (@pxref{Unread Articles}).
 @item t
 Number of ticked articles (@pxref{Unread Articles}).
 @item r
-Number of articles that have been marked as read in this session. 
+Number of articles that have been marked as read in this session.
 @item E
 Number of articles expunged by the score files.
 @end table
@@ -3391,7 +3443,7 @@ As you may have guessed, if @var{FORM} returns a non-@code{nil} value,
 @cindex summary movement
 
 All the straight movement commands understand the numeric prefix and
-behave pretty much as you'd expect. 
+behave pretty much as you'd expect.
 
 None of these commands select articles.
 
@@ -3402,7 +3454,7 @@ None of these commands select articles.
 @kindex G M-n (Summary)
 @findex gnus-summary-next-unread-subject
 Go to the next summary line of an unread article
-(@code{gnus-summary-next-unread-subject}). 
+(@code{gnus-summary-next-unread-subject}).
 
 @item G M-p
 @itemx M-p
@@ -3410,7 +3462,7 @@ Go to the next summary line of an unread article
 @kindex G M-p (Summary)
 @findex gnus-summary-prev-unread-subject
 Go to the previous summary line of an unread article
-(@code{gnus-summary-prev-unread-subject}). 
+(@code{gnus-summary-prev-unread-subject}).
 
 @item G j
 @itemx j
@@ -3456,8 +3508,10 @@ without confirmation.  Also @pxref{Group Levels}.
 If non-@code{nil}, all the movement commands will try to go to the next
 article with the same subject as the current.  (@dfn{Same} here might
 mean @dfn{roughly equal}.  See @code{gnus-summary-gather-subject-limit}
-for details (@pxref{Customizing Threading}).)  This variable is not
-particularly useful if you use a threaded display.
+for details (@pxref{Customizing Threading}).)  If there are no more
+articles with the same subject, go to the first unread article.
+
+This variable is not particularly useful if you use a threaded display.
 
 @item gnus-summary-check-current
 @vindex gnus-summary-check-current
@@ -3534,13 +3588,13 @@ Go to the previous article (@code{gnus-summary-prev-article}).
 @kindex G C-n (Summary)
 @findex gnus-summary-next-same-subject
 Go to the next article with the same subject
-(@code{gnus-summary-next-same-subject}). 
+(@code{gnus-summary-next-same-subject}).
 
 @item G C-p
 @kindex G C-p (Summary)
 @findex gnus-summary-prev-same-subject
 Go to the previous article with the same subject
-(@code{gnus-summary-prev-same-subject}). 
+(@code{gnus-summary-prev-same-subject}).
 
 @item G f
 @itemx .
@@ -3556,7 +3610,7 @@ Go to the first unread article
 @kindex , (Summary)
 @findex gnus-summary-best-unread-article
 Go to the article with the highest score
-(@code{gnus-summary-best-unread-article}). 
+(@code{gnus-summary-best-unread-article}).
 
 @item G l
 @itemx l
@@ -3631,7 +3685,7 @@ next article (@code{gnus-summary-next-page}).
 @item DEL
 @kindex DEL (Summary)
 @findex gnus-summary-prev-page
-Scroll the current article back one page (@code{gnus-summary-prev-page}). 
+Scroll the current article back one page (@code{gnus-summary-prev-page}).
 
 @item RET
 @kindex RET (Summary)
@@ -3664,7 +3718,7 @@ Scroll to the beginning of the article
 @findex gnus-summary-end-of-article
 Scroll to the end of the article (@code{gnus-summary-end-of-article}).
 
-@item A s 
+@item A s
 @itemx s
 @kindex A s (Summary)
 @kindex s (Summary)
@@ -3706,7 +3760,7 @@ Commands for composing a mail message:
 @c @icon{gnus-summary-mail-reply}
 @c @icon{gnus-summary-reply}
 Mail a reply to the author of the current article
-(@code{gnus-summary-reply}). 
+(@code{gnus-summary-reply}).
 
 @item S R
 @itemx R
@@ -3773,7 +3827,7 @@ headers of the message won't be altered---but lots of headers that say
 @code{Resent-To}, @code{Resent-From} and so on will be added.  This
 means that you actually send a mail to someone that has a @code{To}
 header that (probably) points to yourself.  This will confuse people.
-So, natcherly you'll only do that if you're really eVIl.  
+So, natcherly you'll only do that if you're really eVIl.
 
 This command is mainly used if you have several accounts and want to
 ship a mail to a different account of yours.  (If you're both
@@ -3782,7 +3836,7 @@ to the @code{root} account, you may want to resend it to
 @code{postmaster}.  Ordnung muß sein!
 
 This command understands the process/prefix convention
-(@pxref{Process/Prefix}). 
+(@pxref{Process/Prefix}).
 
 @item S O m
 @kindex S O m (Summary)
@@ -3797,10 +3851,10 @@ uses the process/prefix convention (@pxref{Process/Prefix}).
 @cindex crossposting
 @cindex excessive crossposting
 Send a complaint about excessive crossposting to the author of the
-current article (@code{gnus-summary-mail-crosspost-complaint}).  
+current article (@code{gnus-summary-mail-crosspost-complaint}).
 
 @findex gnus-crosspost-complaint
-This command is provided as a way to fight back agains the current
+This command is provided as a way to fight back against the current
 crossposting pandemic that's sweeping Usenet.  It will compose a reply
 using the @code{gnus-crosspost-complaint} variable as a preamble.  This
 command understands the process/prefix convention
@@ -3808,6 +3862,8 @@ command understands the process/prefix convention
 
 @end table
 
+Also @pxref{(message)Header Commands} for more information.
+
 
 @node Summary Post Commands
 @subsection Summary Post Commands
@@ -3850,9 +3906,9 @@ process/prefix convention.
 Post a followup to the current article via news, even if you got the
 message through mail (@code{gnus-summary-followup-to-mail}).
 
-@item S n
-@kindex S n (Summary)
-@findex gnus-summary-followup-to-mail
+@item S N
+@kindex S N (Summary)
+@findex gnus-summary-followup-to-mail-with-original
 Post a followup to the current article via news, even if you got the
 message through mail and include the original message
 (@code{gnus-summary-followup-to-mail-with-original}).  This command uses
@@ -3879,9 +3935,11 @@ process/prefix convention.
 @findex gnus-uu-post-news
 @c @icon{gnus-uu-post-news}
 Uuencode a file, split it into parts, and post it as a series
-(@code{gnus-uu-post-news}). (@pxref{Uuencoding and Posting}). 
+(@code{gnus-uu-post-news}). (@pxref{Uuencoding and Posting}).
 @end table
 
+Also @pxref{(message)Header Commands} for more information.
+
 
 @node Canceling and Superseding
 @section Canceling Articles
@@ -3906,7 +3964,7 @@ Be aware, however, that not all sites honor cancels, so your article may
 live on here and there, while most sites will delete the article in
 question.
 
-Gnus will use the ``current'' select method when cancelling.  If you
+Gnus will use the ``current'' select method when canceling.  If you
 want to use the standard posting method, use the @samp{a} symbolic
 prefix (@pxref{Symbolic Prefixes}).
 
@@ -3945,7 +4003,7 @@ Just remember, kids: There is no 'c' in 'supersede'.
 @cindex article ticking
 @cindex marks
 
-There are several marks you can set on an article. 
+There are several marks you can set on an article.
 
 You have marks that decide the @dfn{readedness} (whoo, neato-keano
 neologism ohoy!) of the article.  Alphabetic marks generally mean
@@ -3985,11 +4043,11 @@ you see an article that you find interesting, or you want to put off
 reading it, or replying to it, until sometime later, you'd typically
 tick it.  However, articles can be expired, so if you want to keep an
 article forever, you'll have to make it persistent (@pxref{Persistent
-Articles}).  
+Articles}).
 
 @item ?
 @vindex gnus-dormant-mark
-Marked as dormant (@code{gnus-dormant-mark}).  
+Marked as dormant (@code{gnus-dormant-mark}).
 
 @dfn{Dormant articles} will only appear in the summary buffer if there
 are followups to it.  If you want to see them even if they don't have
@@ -3997,7 +4055,7 @@ followups, you can use the @kbd{/ D} command (@pxref{Limiting}).
 
 @item SPACE
 @vindex gnus-unread-mark
-Markes as unread (@code{gnus-unread-mark}).
+Marked as unread (@code{gnus-unread-mark}).
 
 @dfn{Unread articles} are articles that haven't been read at all yet.
 @end table
@@ -4089,7 +4147,7 @@ read or not.
 
 @itemize @bullet
 
-@item 
+@item
 You can set a bookmark in the current article.  Say you are reading a
 long thesis on cats' urinary tracts, and have to go home for dinner
 before you've finished reading the thesis.  You can then set a bookmark
@@ -4102,25 +4160,25 @@ All articles that you have replied to or made a followup to (i.e., have
 answered) will be marked with an @samp{A} in the second column
 (@code{gnus-replied-mark}).
 
-@item 
+@item
 @vindex gnus-cached-mark
 Articles stored in the article cache will be marked with an @samp{*} in
 the second column (@code{gnus-cached-mark}).  @xref{Article Caching}
 
-@item 
+@item
 @vindex gnus-saved-mark
 Articles ``saved'' (in some manner or other; not necessarily
 religiously) are marked with an @samp{S} in the second column
 (@code{gnus-saved-mark}).
 
-@item 
+@item
 @vindex gnus-not-empty-thread-mark
 @vindex gnus-empty-thread-mark
 If the @samp{%e} spec is used, the presence of threads or not will be
 marked with @code{gnus-not-empty-thread-mark} and
 @code{gnus-empty-thread-mark} in the third column, respectively.
 
-@item 
+@item
 @vindex gnus-process-mark
 Finally we have the @dfn{process mark} (@code{gnus-process-mark}).  A
 variety of commands react to the presence of the process mark.  For
@@ -4162,7 +4220,7 @@ article as unread.
 @kindex M t (Summary)
 @findex gnus-summary-tick-article-forward
 Tick the current article (@code{gnus-summary-tick-article-forward}).
-@xref{Article Caching} 
+@xref{Article Caching}
 
 @item M ?
 @itemx ?
@@ -4170,7 +4228,7 @@ Tick the current article (@code{gnus-summary-tick-article-forward}).
 @kindex M ? (Summary)
 @findex gnus-summary-mark-as-dormant
 Mark the current article as dormant
-(@code{gnus-summary-mark-as-dormant}).  @xref{Article Caching} 
+(@code{gnus-summary-mark-as-dormant}).  @xref{Article Caching}
 
 @item M d
 @itemx d
@@ -4201,7 +4259,7 @@ and then select the next unread article
 @kindex C-k (Summary)
 @findex gnus-summary-kill-same-subject
 Mark all articles that have the same subject as the current one as read
-(@code{gnus-summary-kill-same-subject}).  
+(@code{gnus-summary-kill-same-subject}).
 
 @item M C
 @kindex M C (Summary)
@@ -4219,13 +4277,13 @@ articles (@code{gnus-summary-catchup-all}).
 @kindex M H (Summary)
 @findex gnus-summary-catchup-to-here
 Catchup the current group to point
-(@code{gnus-summary-catchup-to-here}). 
+(@code{gnus-summary-catchup-to-here}).
 
 @item C-w
 @kindex C-w (Summary)
 @findex gnus-summary-mark-region-as-read
 Mark all articles between point and mark as read
-(@code{gnus-summary-mark-region-as-read}). 
+(@code{gnus-summary-mark-region-as-read}).
 
 @item M V k
 @kindex M V k (Summary)
@@ -4295,10 +4353,10 @@ The default is @code{t}.
 @kindex M P p (Summary)
 @findex gnus-summary-mark-as-processable
 Mark the current article with the process mark
-(@code{gnus-summary-mark-as-processable}). 
+(@code{gnus-summary-mark-as-processable}).
 @findex gnus-summary-unmark-as-processable
 
-@item M P u 
+@item M P u
 @itemx M-#
 @kindex M P u (Summary)
 @kindex M-# (Summary)
@@ -4309,18 +4367,19 @@ Remove the process mark, if any, from the current article
 @kindex M P U (Summary)
 @findex gnus-summary-unmark-all-processable
 Remove the process mark from all articles
-(@code{gnus-summary-unmark-all-processable}). 
+(@code{gnus-summary-unmark-all-processable}).
 
 @item M P i
 @kindex M P i (Summary)
 @findex gnus-uu-invert-processable
 Invert the list of process marked articles
-(@code{gnus-uu-invert-processable}). 
+(@code{gnus-uu-invert-processable}).
 
 @item M P R
 @kindex M P R (Summary)
 @findex gnus-uu-mark-by-regexp
-Mark articles by a regular expression (@code{gnus-uu-mark-by-regexp}). 
+Mark articles that have a @code{Subject} header that matches a regular
+expression (@code{gnus-uu-mark-by-regexp}).
 
 @item M P r
 @kindex M P r (Summary)
@@ -4365,7 +4424,7 @@ Mark all articles in series order (@code{gnus-uu-mark-series}).
 @kindex M P b (Summary)
 @findex gnus-uu-mark-buffer
 Mark all articles in the buffer in the order they appear
-(@code{gnus-uu-mark-buffer}). 
+(@code{gnus-uu-mark-buffer}).
 
 @item M P k
 @kindex M P k (Summary)
@@ -4395,7 +4454,7 @@ Push the current process mark set onto the stack
 It can be convenient to limit the summary buffer to just show some
 subset of the articles currently in the group.  The effect most limit
 commands have is to remove a few (or many) articles from the summary
-buffer. 
+buffer.
 
 All limiting commands work on subsets of the articles already fetched
 from the servers.  None of these commands query the server for
@@ -4408,7 +4467,7 @@ additional articles.
 @kindex / / (Summary)
 @findex gnus-summary-limit-to-subject
 Limit the summary buffer to articles that match some subject
-(@code{gnus-summary-limit-to-subject}). 
+(@code{gnus-summary-limit-to-subject}).
 
 @item / a
 @kindex / a (Summary)
@@ -4429,7 +4488,7 @@ dormant articles will also be excluded.
 @item / m
 @kindex / m (Summary)
 @findex gnus-summary-limit-to-marks
-Ask for a mark and then limit to all articles that have not been marked
+Ask for a mark and then limit to all articles that have been marked
 with that mark (@code{gnus-summary-limit-to-marks}).
 
 @item / t
@@ -4464,29 +4523,37 @@ score (@code{gnus-summary-limit-to-score}).
 @kindex M S (Summary)
 @kindex / E (Summary)
 @findex gnus-summary-limit-include-expunged
-Display all expunged articles
-(@code{gnus-summary-limit-include-expunged}). 
+Include all expunged articles in the limit
+(@code{gnus-summary-limit-include-expunged}).
 
 @item / D
 @kindex / D (Summary)
 @findex gnus-summary-limit-include-dormant
-Display all dormant articles (@code{gnus-summary-limit-include-dormant}).
+Include all dormant articles in the limit
+(@code{gnus-summary-limit-include-dormant}).
+
+@item / *
+@kindex / * (Summary)
+@findex gnus-summary-limit-include-cached
+Include all cached articles in the limit
+(@code{gnus-summary-limit-include-cached}).
 
 @item / d
 @kindex / d (Summary)
 @findex gnus-summary-limit-exclude-dormant
-Hide all dormant articles (@code{gnus-summary-limit-exclude-dormant}).
+Exclude all dormant articles from the limit
+(@code{gnus-summary-limit-exclude-dormant}).
 
 @item / T
 @kindex / T (Summary)
 @findex gnus-summary-limit-include-thread
-Include all the articles in the current thread.
+Include all the articles in the current thread in the limit.
 
 @item / c
 @kindex / c (Summary)
 @findex gnus-summary-limit-exclude-childless-dormant
-Hide all dormant articles that have no children
-(@code{gnus-summary-limit-exclude-childless-dormant}). 
+Exclude all dormant articles that have no children from the limit
+(@code{gnus-summary-limit-exclude-childless-dormant}).
 
 @item / C
 @kindex / C (Summary)
@@ -4510,10 +4577,10 @@ hierarchical fashion.
 Threading is done by looking at the @code{References} headers of the
 articles.  In a perfect world, this would be enough to build pretty
 trees, but unfortunately, the @code{References} header is often broken
-or simply missing.  Weird news propagration excarcerbates the problem,
+or simply missing.  Weird news propagation excarcerbates the problem,
 so one has to employ other heuristics to get pleasing results.  A
 plethora of approaches exists, as detailed in horrible detail in
-@pxref{Customizing Threading}. 
+@pxref{Customizing Threading}.
 
 First, a quick overview of the concepts:
 
@@ -4530,7 +4597,7 @@ A small(er) section of this tree-like structure.
 @item loose threads
 Threads often lose their roots due to article expiry, or due to the root
 already having been read in a previous session, and not displayed in the
-summary buffer.  We then typicall have many sub-threads that really
+summary buffer.  We then typically have many sub-threads that really
 belong to one thread, but are without connecting roots.  These are
 called loose threads.
 
@@ -4639,7 +4706,7 @@ everything in sight into one thread, which isn't very helpful.
 @cindex fuzzy article gathering
 If you set this variable to the special value @code{fuzzy}, Gnus will
 use a fuzzy string comparison algorithm on the subjects (@pxref{Fuzzy
-Matching}). 
+Matching}).
 
 @item gnus-simplify-subject-fuzzy-regexp
 @vindex gnus-simplify-subject-fuzzy-regexp
@@ -4655,13 +4722,13 @@ as 10, you might consider setting this variable to something sensible:
 @c Written by Michael Ernst <mernst@cs.rice.edu>
 @lisp
 (setq gnus-simplify-ignored-prefixes
-      (concat 
+      (concat
        "\\`\\[?\\("
-       (mapconcat 
+       (mapconcat
         'identity
         '("looking"
           "wanted" "followup" "summary\\( of\\)?"
-          "help" "query" "problem" "question" 
+          "help" "query" "problem" "question"
           "answer" "reference" "announce"
           "How can I" "How to" "Comparison of"
           ;; ...
@@ -4675,7 +4742,7 @@ as 10, you might consider setting this variable to something sensible:
 @end lisp
 
 All words that match this regexp will be removed before comparing two
-subjects. 
+subjects.
 
 @item gnus-simplify-subject-functions
 @vindex gnus-simplify-subject-functions
@@ -4710,7 +4777,7 @@ to many false hits, especially with certain common subjects like
 @samp{} and @samp{(none)}.  To make the situation slightly better,
 you can use the regexp @code{gnus-summary-gather-exclude-subject} to say
 what subjects should be excluded from the gathering process.@*
-The default is @samp{^ *$\\|^(none)$}.  
+The default is @samp{^ *$\\|^(none)$}.
 
 @item gnus-summary-thread-gathering-function
 @vindex gnus-summary-thread-gathering-function
@@ -4764,7 +4831,7 @@ expired by the server, there's not much Gnus can do about that.
 
 This variable can also be set to @code{invisible}.  This won't have any
 visible effects, but is useful if you use the @kbd{A T} command a lot
-(@pxref{Finding the Parent}). 
+(@pxref{Finding the Parent}).
 
 @item gnus-build-sparse-threads
 @vindex gnus-build-sparse-threads
@@ -4886,7 +4953,7 @@ articles instead.
 @kindex M-C-l (Summary)
 @findex gnus-summary-lower-thread
 Lower the score of the current (sub-)thread
-(@code{gnus-summary-lower-thread}). 
+(@code{gnus-summary-lower-thread}).
 
 @item T i
 @kindex T i (Summary)
@@ -4978,7 +5045,7 @@ Ascend the thread (@code{gnus-summary-up-thread}).
 Go to the top of the thread (@code{gnus-summary-top-thread}).
 @end table
 
-@vindex gnus-thread-operation-ignore-subject 
+@vindex gnus-thread-operation-ignore-subject
 If you ignore subject while threading, you'll naturally end up with
 threads that have several different subjects in them.  If you then issue
 a command like `T k' (@code{gnus-summary-kill-thread}) you might not
@@ -5025,7 +5092,7 @@ If you would like to sort by score, then by subject, and finally by
 number, you could do something like:
 
 @lisp
-(setq gnus-thread-sort-functions 
+(setq gnus-thread-sort-functions
       '(gnus-thread-sort-by-number
         gnus-thread-sort-by-subject
         gnus-thread-sort-by-total-score))
@@ -5042,8 +5109,8 @@ say something like:
 
 @lisp
 (setq gnus-thread-sort-functions
-      '((lambda (t1 t2) 
-          (not (gnus-thread-sort-by-number t2 t1)))
+      '((lambda (t1 t2)
+          (not (gnus-thread-sort-by-number t1 t2)))
         gnus-thread-sort-by-score))
 @end lisp
 
@@ -5071,7 +5138,7 @@ If you want to sort an unthreaded summary display by subject, you could
 say something like:
 
 @lisp
-(setq gnus-article-sort-functions 
+(setq gnus-article-sort-functions
       '(gnus-article-sort-by-number
         gnus-article-sort-by-subject))
 @end lisp
@@ -5091,7 +5158,7 @@ article appears.  Why can't Gnus just go ahead and fetch the article
 while you are reading the previous one?  Why not, indeed.
 
 First, some caveats.  There are some pitfalls to using asynchronous
-article fetching, especially the way Gnus does it.  
+article fetching, especially the way Gnus does it.
 
 Let's say you are reading article 1, which is short, and article 2 is
 quite long, and you are not interested in reading that.  Gnus does not
@@ -5267,17 +5334,17 @@ you use two explicit commands for managing persistent articles:
 @item *
 @kindex * (Summary)
 @findex gnus-cache-enter-article
-Make the current article persistent (@code{gnus-cache-enter-article}). 
+Make the current article persistent (@code{gnus-cache-enter-article}).
 
 @item M-*
 @kindex M-* (Summary)
 @findex gnus-cache-remove-article
 Remove the current article from the persistent articles
 (@code{gnus-cache-remove-article}).  This will normally delete the
-article. 
+article.
 @end table
 
-Both these commands understand the process/prefix convention. 
+Both these commands understand the process/prefix convention.
 
 To avoid having all ticked articles (and stuff) entered into the cache,
 you should set @code{gnus-use-cache} to @code{passive} if you're just
@@ -5308,7 +5375,7 @@ at most @var{n} old articles in a buffer for later re-fetching.  If this
 variable is non-@code{nil} and is not a number, Gnus will store
 @emph{all} read articles, which means that your Emacs will grow without
 bound before exploding and taking your machine down with you.  I put
-that in there just to keep y'all on your toes.  
+that in there just to keep y'all on your toes.
 
 This variable is @code{nil} by default.
 
@@ -5341,44 +5408,44 @@ deleted before saving.
 @findex gnus-summary-save-article
 @c @icon{gnus-summary-save-article}
 Save the current article using the default article saver
-(@code{gnus-summary-save-article}). 
+(@code{gnus-summary-save-article}).
 
 @item O m
 @kindex O m (Summary)
 @findex gnus-summary-save-article-mail
 Save the current article in mail format
-(@code{gnus-summary-save-article-mail}). 
+(@code{gnus-summary-save-article-mail}).
 
 @item O r
 @kindex O r (Summary)
 @findex gnus-summary-save-article-rmail
 Save the current article in rmail format
-(@code{gnus-summary-save-article-rmail}). 
+(@code{gnus-summary-save-article-rmail}).
 
 @item O f
 @kindex O f (Summary)
 @findex gnus-summary-save-article-file
 @c @icon{gnus-summary-save-article-file}
 Save the current article in plain file format
-(@code{gnus-summary-save-article-file}). 
+(@code{gnus-summary-save-article-file}).
 
 @item O F
 @kindex O F (Summary)
 @findex gnus-summary-write-article-file
 Write the current article in plain file format, overwriting any previous
-file contents (@code{gnus-summary-write-article-file}). 
+file contents (@code{gnus-summary-write-article-file}).
 
 @item O b
 @kindex O b (Summary)
 @findex gnus-summary-save-article-body-file
 Save the current article body in plain file format
-(@code{gnus-summary-save-article-body-file}). 
+(@code{gnus-summary-save-article-body-file}).
 
 @item O h
 @kindex O h (Summary)
 @findex gnus-summary-save-article-folder
 Save the current article in mh folder format
-(@code{gnus-summary-save-article-folder}). 
+(@code{gnus-summary-save-article-folder}).
 
 @item O v
 @kindex O v (Summary)
@@ -5405,7 +5472,7 @@ just once for each series of articles you save.  If you like to really
 have Gnus do all your thinking for you, you can even set this variable
 to @code{nil}, which means that you will never be prompted for files to
 save articles in.  Gnus will simply save all the articles in the default
-files. 
+files.
 
 
 @vindex gnus-default-article-saver
@@ -5467,7 +5534,7 @@ reader to use this setting.
 All of these functions, except for the last one, will save the article
 in the @code{gnus-article-save-directory}, which is initialized from the
 @code{SAVEDIR} environment variable.  This is @file{~/News/} by
-default. 
+default.
 
 As you can see above, the functions use different functions to find a
 suitable name of a file to save the article in.  Below is a list of
@@ -5524,7 +5591,7 @@ name completion over the results from applying this variable.
 This variable is @code{((gnus-article-archive-name))} by default, which
 means that Gnus will look at the articles it saves for an
 @code{Archive-name} line and use that as a suggestion for the file
-name. 
+name.
 
 Here's an example function to clean up file names somewhat.  If you have
 lots of mail groups called things like
@@ -5548,7 +5615,7 @@ Finally, you have the @code{gnus-use-long-file-name} variable.  If it is
 @code{nil}, all the preceding functions will replace all periods
 (@samp{.}) in the group names with slashes (@samp{/})---which means that
 the functions will generate hierarchies of directories instead of having
-all the files in the toplevel directory
+all the files in the top level directory
 (@file{~/News/alt/andrea-dworkin} instead of
 @file{~/News/alt.andrea-dworkin}.)  This variable is @code{t} by default
 on most systems.  However, for historical reasons, this is @code{nil} on
@@ -5571,7 +5638,7 @@ a spool, you could
 
 Then just save with @kbd{o}.  You'd then read this hierarchy with
 ephemeral @code{nneething} groups---@kbd{G D} in the group buffer, and
-the toplevel directory as the argument (@file{~/News/}).  Then just walk
+the top level directory as the argument (@file{~/News/}).  Then just walk
 around to the groups/directories with @code{nneething}.
 
 
@@ -5582,7 +5649,7 @@ around to the groups/directories with @code{nneething}.
 Sometime users post articles (or series of articles) that have been
 encoded in some way or other.  Gnus can decode them for you.
 
-@menu 
+@menu
 * Uuencoded Articles::    Uudecode articles.
 * Shell Archives::        Unshar articles.
 * PostScript Files::      Split PostScript.
@@ -5605,7 +5672,7 @@ last two numbers of the line.  (Spaces are largely ignored, however.)
 
 For example: If you choose a subject called @samp{cat.gif (2/3)}, Gnus
 will find all the articles that match the regexp @samp{^cat.gif
-([0-9]+/[0-9]+).*$}.  
+([0-9]+/[0-9]+).*$}.
 
 Subjects that are non-standard, like @samp{cat.gif (2/3) Part 6 of a
 series}, will not be properly recognized by any of the automatic viewing
@@ -5696,7 +5763,7 @@ Unshars and views the current series (@code{gnus-uu-decode-unshar-view}).
 @kindex X v S (Summary)
 @findex gnus-uu-decode-unshar-and-save-view
 Unshars, views and saves the current series
-(@code{gnus-uu-decode-unshar-and-save-view}). 
+(@code{gnus-uu-decode-unshar-and-save-view}).
 @end table
 
 
@@ -5727,7 +5794,7 @@ View the current PostScript series
 @kindex X v P (Summary)
 @findex gnus-uu-decode-postscript-and-save-view
 View and save the current PostScript series
-(@code{gnus-uu-decode-postscript-and-save-view}). 
+(@code{gnus-uu-decode-postscript-and-save-view}).
 @end table
 
 
@@ -5754,7 +5821,7 @@ doesn't really work yet.
 
 Adjective, not verb.
 
-@menu 
+@menu
 * Rule Variables::          Variables that say how a file is to be viewed.
 * Other Decode Variables::  Other decode variables.
 * Uuencoding and Posting::  Variables for customizing uuencoding.
@@ -5767,7 +5834,7 @@ Adjective, not verb.
 
 Gnus uses @dfn{rule variables} to decide how to view a file.  All these
 variables are of the form
-  
+
 @lisp
       (list '(regexp1 command2)
             '(regexp2 command2)
@@ -5967,7 +6034,7 @@ the pseudo-articles into the summary buffer, but view them
 immediately.  If this variable is @code{not-confirm}, the user won't even
 be asked for a confirmation before viewing is done.
 
-@vindex gnus-view-pseudos-separately 
+@vindex gnus-view-pseudos-separately
 If @code{gnus-view-pseudos-separately} is non-@code{nil}, one
 pseudo-article will be created for each file to be viewed.  If
 @code{nil}, all files that use the same viewing command will be given as
@@ -5993,7 +6060,7 @@ these articles easier.
 
 @menu
 * Article Highlighting::    You want to make the article look like fruit salad.
-* Article Fontisizing::     Making emphasized text look niced.
+* Article Fontisizing::     Making emphasized text look nice.
 * Article Hiding::          You also want to make certain info go away.
 * Article Washing::         Lots of way-neat functions to make life better.
 * Article Buttons::         Click on URLs, Message-IDs, addresses and the like.
@@ -6004,17 +6071,25 @@ these articles easier.
 
 @node Article Highlighting
 @subsection Article Highlighting
-@cindex highlight
+@cindex highlighting
 
 Not only do you want your article buffer to look like fruit salad, but
-you want it to look like technicolor fruit salad.
+you want it to look like technicolor fruit salad.  
 
 @table @kbd
 
 @item W H a
 @kindex W H a (Summary)
 @findex gnus-article-highlight
-Highlight the current article (@code{gnus-article-highlight}).
+@findex gnus-article-maybe-highlight
+Do much highlighting of the current article
+(@code{gnus-article-highlight}).  This function highlights header, cited
+text, the signature, and adds buttons to the body and the head.
+
+Most users would prefer using @code{gnus-article-maybe-highlight} in
+@code{gnus-article-display-hook} (@pxref{Customizing Articles}) instead.
+This is a bit less agressive---it highlights only the headers, the
+signature and adds buttons.
 
 @item W H h
 @kindex W H h (Summary)
@@ -6032,7 +6107,7 @@ the header value.  The first match made will be used.  Note that
 @item W H c
 @kindex W H c (Summary)
 @findex gnus-article-highlight-citation
-Highlight cited text (@code{gnus-article-highlight-citation}). 
+Highlight cited text (@code{gnus-article-highlight-citation}).
 
 Some variables to customize the citation highlights:
 
@@ -6041,11 +6116,11 @@ Some variables to customize the citation highlights:
 
 @item gnus-cite-parse-max-size
 If the article size if bigger than this variable (which is 25000 by
-default), no citation highlighting will be performed.  
+default), no citation highlighting will be performed.
 
 @item gnus-cite-prefix-regexp
 @vindex gnus-cite-prefix-regexp
-Regexp matching the longest possible citation prefix on a line. 
+Regexp matching the longest possible citation prefix on a line.
 
 @item gnus-cite-max-prefix
 @vindex gnus-cite-max-prefix
@@ -6060,7 +6135,7 @@ This should make it easier to see who wrote what.
 
 @item gnus-supercite-regexp
 @vindex gnus-supercite-regexp
-Regexp matching normal Supercite attribution lines.  
+Regexp matching normal Supercite attribution lines.
 
 @item gnus-supercite-secondary-regexp
 @vindex gnus-supercite-secondary-regexp
@@ -6100,6 +6175,8 @@ default.
 
 @end table
 
+@xref{Customizing Articles} for how to highlight articles automatically.
+
 
 @node Article Fontisizing
 @subsection Article Fontisizing
@@ -6113,9 +6190,9 @@ like @samp{_this_} or @samp{*this*}.  Gnus can make this look nicer by
 running the article through the @kbd{W e}
 (@code{gnus-article-emphasize}) command.
 
-@vindex gnus-article-emphasis
+@vindex gnus-emphasis-alist
 How the emphasis is computed is controlled by the
-@code{gnus-article-emphasis} variable.  This is an alist where the first
+@code{gnus-emphasis-alist} variable.  This is an alist where the first
 element is a regular expression to be matched.  The second is a number
 that says what regular expression grouping is used to find the entire
 emphasized word.  The third is a number that says what regexp grouping
@@ -6141,7 +6218,7 @@ By default, there are seven rules, and they use the following faces:
 @code{gnus-emphasis-underline}, @code{gnus-emphasis-bold-italic},
 @code{gnus-emphasis-underline-italic},
 @code{gnus-emphasis-underline-bold}, and
-@code{gnus-emphasis-underline-bold-italic}.  
+@code{gnus-emphasis-underline-bold-italic}.
 
 If you want to change these faces, you can either use @kbd{M-x
 customize}, or you can use @code{copy-face}.  For instance, if you want
@@ -6152,26 +6229,30 @@ say something like:
 (copy-face 'red 'gnus-emphasis-italic)
 @end lisp
 
+@xref{Customizing Articles} for how to fontize articles automatically.
+
 
 @node Article Hiding
 @subsection Article Hiding
 @cindex article hiding
 
 Or rather, hiding certain things in each article.  There usually is much
-too much cruft in most articles.  
+too much cruft in most articles.
 
 @table @kbd
 
 @item W W a
 @kindex W W a (Summary)
 @findex gnus-article-hide
-Do maximum hiding on the summary buffer (@kbd{gnus-article-hide}). 
+Do quite a lot of hiding on the article buffer
+(@kbd{gnus-article-hide}).  In particular, this function will hide
+headers, PGP, cited text and the signature.  
 
 @item W W h
 @kindex W W h (Summary)
 @findex gnus-article-hide-headers
 Hide headers (@code{gnus-article-hide-headers}).  @xref{Hiding
-Headers}. 
+Headers}.
 
 @item W W b
 @kindex W W b (Summary)
@@ -6183,7 +6264,7 @@ Hide headers that aren't particularly interesting
 @kindex W W s (Summary)
 @findex gnus-article-hide-signature
 Hide signature (@code{gnus-article-hide-signature}).  @xref{Article
-Signature}. 
+Signature}.
 
 @item W W p
 @kindex W W p (Summary)
@@ -6207,21 +6288,13 @@ customizing the hiding:
 
 @table @code
 
-@item gnus-cite-hide-percentage
-@vindex gnus-cite-hide-percentage
-If the cited text is of a bigger percentage than this variable (default
-50), hide the cited text.
-
-@item gnus-cite-hide-absolute
-@vindex gnus-cite-hide-absolute
-The cited text must have at least this length (default 10) before it
-is hidden.
-
-@item gnus-cited-text-button-line-format
-@vindex gnus-cited-text-button-line-format
+@item gnus-cited-opened-text-button-line-format
+@itemx gnus-cited-closed-text-button-line-format
+@vindex gnus-cited-closed-text-button-line-format
+@vindex gnus-cited-opened-text-button-line-format
 Gnus adds buttons to show where the cited text has been hidden, and to
 allow toggle hiding the text.  The format of the variable is specified
-by this format-like variable (@pxref{Formatting Variables}).  These
+by these format-like variable (@pxref{Formatting Variables}).  These
 specs are valid:
 
 @table @samp
@@ -6235,17 +6308,36 @@ Length of the hidden text.
 
 @item gnus-cited-lines-visible
 @vindex gnus-cited-lines-visible
-The number of lines at the beginning of the cited text to leave shown. 
+The number of lines at the beginning of the cited text to leave shown.
 
 @end table
 
+@item W W C-c
+@kindex W W C-c (Summary)
+@findex gnus-article-hide-citation-maybe
+
+Hide citation (@code{gnus-article-hide-citation-maybe}) depending on the
+following two variables:
+
+@table @code
+@item gnus-cite-hide-percentage
+@vindex gnus-cite-hide-percentage
+If the cited text is of a bigger percentage than this variable (default
+50), hide the cited text.
+
+@item gnus-cite-hide-absolute
+@vindex gnus-cite-hide-absolute
+The cited text must have at least this length (default 10) before it
+is hidden.
+@end table
+
 @item W W C
 @kindex W W C (Summary)
 @findex gnus-article-hide-citation-in-followups
 Hide cited text in articles that aren't roots
 (@code{gnus-article-hide-citation-in-followups}).  This isn't very
 useful as an interactive command, but might be a handy function to stick
-in @code{gnus-article-display-hook} (@pxref{Customizing Articles}). 
+in @code{gnus-article-display-hook} (@pxref{Customizing Articles}).
 
 @end table
 
@@ -6256,6 +6348,9 @@ hidden.  If you give a positive prefix, they will always hide.
 Also @pxref{Article Highlighting} for further variables for
 citation customization.
 
+@xref{Customizing Articles} for how to hide article elements
+automatically.
+
 
 @node Article Washing
 @subsection Article Washing
@@ -6275,27 +6370,28 @@ Cleaner, perhaps.
 @kindex W l (Summary)
 @findex gnus-summary-stop-page-breaking
 Remove page breaks from the current article
-(@code{gnus-summary-stop-page-breaking}).
+(@code{gnus-summary-stop-page-breaking}).  @xref{Misc Article} for page
+delimiters. 
 
 @item W r
 @kindex W r (Summary)
 @findex gnus-summary-caesar-message
 @c @icon{gnus-summary-caesar-message}
 Do a Caesar rotate (rot13) on the article buffer
-(@code{gnus-summary-caesar-message}). 
+(@code{gnus-summary-caesar-message}).
 Unreadable articles that tell you to read them with Caesar rotate or rot13.
 (Typically offensive jokes and such.)
 
 It's commonly called ``rot13'' because each letter is rotated 13
 positions in the alphabet, e. g. @samp{B} (letter #2) -> @samp{O} (letter
 #15).  It is sometimes referred to as ``Caesar rotate'' because Caesar
-is rumoured to have employed this form of, uh, somewhat weak encryption.
+is rumored to have employed this form of, uh, somewhat weak encryption.
 
 @item W t
 @kindex W t (Summary)
 @findex gnus-summary-toggle-header
 Toggle whether to display all headers in the article buffer
-(@code{gnus-summary-toggle-header}). 
+(@code{gnus-summary-toggle-header}).
 
 @item W v
 @kindex W v (Summary)
@@ -6382,7 +6478,7 @@ Add clickable buttons to the article (@code{gnus-article-add-buttons}).
 @kindex W B (Summary)
 @findex gnus-article-add-buttons-to-head
 Add clickable buttons to the article headers
-(@code{gnus-article-add-buttons-to-head}).  
+(@code{gnus-article-add-buttons-to-head}).
 
 @item W E l
 @kindex W E l (Summary)
@@ -6423,6 +6519,8 @@ body (@code{gnus-article-strip-leading-space}).
 
 @end table
 
+@xref{Customizing Articles} for how to wash articles automatically.
+
 
 @node Article Buttons
 @subsection Article Buttons
@@ -6453,7 +6551,7 @@ This is an alist where each entry has this form:
 @item regexp
 All text that match this regular expression will be considered an
 external reference.  Here's a typical regexp that matches embedded URLs:
-@samp{<URL:\\([^\n\r>]*\\)>}. 
+@samp{<URL:\\([^\n\r>]*\\)>}.
 
 @item button-par
 Gnus has to know which parts of the matches is to be highlighted.  This
@@ -6470,7 +6568,7 @@ This function will be called when you click on this button.
 
 @item data-par
 As with @var{button-par}, this is a sub-expression number, but this one
-says which part of the match is to be sent as data to @var{function}. 
+says which part of the match is to be sent as data to @var{function}.
 
 @end table
 
@@ -6507,6 +6605,8 @@ Face used when the mouse cursor is over a button.
 
 @end table
 
+@xref{Customizing Articles} for how to buttonize articles automatically.
+
 
 @node Article Date
 @subsection Article Date
@@ -6521,7 +6621,7 @@ when the article was sent.
 @kindex W T u (Summary)
 @findex gnus-article-date-ut
 Display the date in UT (aka. GMT, aka ZULU)
-(@code{gnus-article-date-ut}). 
+(@code{gnus-article-date-ut}).
 
 @item W T i
 @kindex W T i (Summary)
@@ -6574,6 +6674,9 @@ that the article was posted in 1854.  Although something like that is
 
 @end table
 
+@xref{Customizing Articles} for how to display the date in your
+preferred format automatically.
+
 
 @node Article Signature
 @subsection Article Signature
@@ -6594,7 +6697,7 @@ from the end of the body towards the beginning.)  One likely value is:
 (setq gnus-signature-separator
       '("^-- $"         ; The standard
         "^-- *$"        ; A common mangling
-        "^-------*$"    ; Many people just use a looong 
+        "^-------*$"    ; Many people just use a looong
                         ; line of dashes.  Shame!
         "^ *--------*$" ; Double-shame!
         "^________*$"   ; Underscores are also popular
@@ -6606,16 +6709,16 @@ positives.
 
 @vindex gnus-signature-limit
 @code{gnus-signature-limit} provides a limit to what is considered a
-signature. 
+signature.
 
 @enumerate
-@item 
+@item
 If it is an integer, no signature may be longer (in characters) than
 that integer.
-@item 
+@item
 If it is a floating point number, no signature may be longer (in lines)
 than that number.
-@item 
+@item
 If it is a function, the function will be called without any parameters,
 and if it returns @code{nil}, there is no signature in the buffer.
 @item
@@ -6647,7 +6750,7 @@ signature after all.
 @cindex printing
 @kindex A P (Summary)
 @vindex gnus-ps-print-hook
-@findex gnus-summary-print-article 
+@findex gnus-summary-print-article
 Generate and print a PostScript image of the article buffer
 (@code{gnus-summary-print-article}).  @code{gnus-ps-print-hook} will be
 run just before printing the buffer.
@@ -6726,7 +6829,7 @@ the ancestry.  If given a negative numerical prefix, fetch just that
 ancestor.  So if you say @kbd{3 ^}, Gnus will fetch the parent, the
 grandparent and the grandgrandparent of the current article.  If you say
 @kbd{-3 ^}, Gnus will only fetch the grandgrandparent of the current
-article. 
+article.
 
 @item A R (Summary)
 @findex gnus-summary-refer-references
@@ -6818,10 +6921,13 @@ Here are the available keystrokes when using pick mode:
 @table @kbd
 @item .
 @kindex . (Pick)
-@findex gnus-summary-mark-as-processable
-Pick the article on the current line
-(@code{gnus-summary-mark-as-processable}).  If given a numerical prefix,
-go to that article and pick it.  (The line number is normally displayed
+@findex gnus-pick-article-or-thread
+Pick the article or thread on the current line
+(@code{gnus-pick-article-or-thread}).  If the variable
+@code{gnus-thread-hide-subtree} is true, then this key selects the
+entire thread when used at the first article of the thread.  Otherwise,
+it selects just the article. If given a numerical prefix, go to that
+thread or article and pick it.  (The line number is normally displayed
 at the beginning of the summary pick lines.)
 
 @item SPACE
@@ -6832,53 +6938,13 @@ at the end of the buffer, start reading the picked articles.
 
 @item u
 @kindex u (Pick)
-@findex gnus-summary-unmark-as-processable
-Unpick the article (@code{gnus-summary-unmark-as-processable}). 
-
-@item U
-@kindex U (Pick)
-@findex gnus-summary-unmark-all-processable
-Unpick all articles (@code{gnus-summary-unmark-all-processable}). 
-
-@item t
-@kindex t (Pick)
-@findex gnus-uu-mark-thread
-Pick the thread (@code{gnus-uu-mark-thread}). 
-
-@item T
-@kindex T (Pick)
-@findex gnus-uu-unmark-thread
-Unpick the thread (@code{gnus-uu-unmark-thread}). 
-
-@item r
-@kindex r (Pick)
-@findex gnus-uu-mark-region
-Pick the region (@code{gnus-uu-mark-region}). 
-
-@item R
-@kindex R (Pick)
-@findex gnus-uu-unmark-region
-Unpick the region (@code{gnus-uu-unmark-region}). 
-
-@item e
-@kindex e (Pick)
-@findex gnus-uu-mark-by-regexp
-Pick articles that match a regexp (@code{gnus-uu-mark-by-regexp}). 
-
-@item E
-@kindex E (Pick)
-@findex gnus-uu-unmark-by-regexp
-Unpick articles that match a regexp (@code{gnus-uu-unmark-by-regexp}). 
-
-@item b
-@kindex b (Pick)
-@findex gnus-uu-mark-buffer
-Pick the buffer (@code{gnus-uu-mark-buffer}). 
-
-@item B
-@kindex B (Pick)
-@findex gnus-uu-unmark-buffer
-Unpick the buffer (@code{gnus-uu-unmark-buffer}). 
+@findex gnus-pick-unmark-article-or-thread.
+Unpick the thread or article
+(@code{gnus-pick-unmark-article-or-thread}).  If the variable
+@code{gnus-thread-hide-subtree} is true, then this key unpicks the
+thread if used at the first article of the thread.  Otherwise it unpicks 
+just the article.  You can give this key a numerical prefix to unpick
+the thread or article at that line.
 
 @item RET
 @kindex RET (Pick)
@@ -6891,6 +6957,11 @@ will still be visible when you are reading.
 
 @end table
 
+All the normal summary mode commands are still available in the
+pick-mode, with the exception of @kbd{u}.  However @kbd{!} is available
+which is mapped to the same function
+@code{gnus-summary-tick-article-forward}.
+
 If this sounds like a good idea to you, you could say:
 
 @lisp
@@ -6910,7 +6981,7 @@ standard format.  At the beginning of each line the line number is
 displayed.  The pick mode line format is controlled by the
 @code{gnus-summary-pick-line-format} variable (@pxref{Formatting
 Variables}).  It accepts the same format specs that
-@code{gnus-summary-line-format} does (@pxref{Summary Buffer Lines}). 
+@code{gnus-summary-line-format} does (@pxref{Summary Buffer Lines}).
 
 
 @node Binary Groups
@@ -6923,7 +6994,7 @@ If you spend much time in binary groups, you may grow tired of hitting
 @kbd{X u}, @kbd{n}, @kbd{RET} all the time.  @kbd{M-x gnus-binary-mode}
 is a minor mode for summary buffers that makes all ordinary Gnus article
 selection functions uudecode series of articles and display the result
-instead of just displaying the articles the normal way.  
+instead of just displaying the articles the normal way.
 
 @kindex g (Binary)
 @findex gnus-binary-show-article
@@ -6943,7 +7014,7 @@ command, when you have turned on this mode
 If you don't like the normal Gnus summary display, you might try setting
 @code{gnus-use-trees} to @code{t}.  This will create (by default) an
 additional @dfn{tree buffer}.  You can execute all summary mode commands
-in the tree buffer.  
+in the tree buffer.
 
 There are a few variables to customize the tree display, of course:
 
@@ -6954,9 +7025,9 @@ A hook called in all tree mode buffers.
 
 @item gnus-tree-mode-line-format
 @vindex gnus-tree-mode-line-format
-A format string for the mode bar in the tree mode buffers.  The default
-is @samp{Gnus: %%b %S %Z}.  For a list of valid specs, @pxref{Summary
-Buffer Mode Line}. 
+A format string for the mode bar in the tree mode buffers (@pxref{Mode
+Line Formatting}).  The default is @samp{Gnus: %%b %S %Z}.  For a list
+of valid specs, @pxref{Summary Buffer Mode Line}.
 
 @item gnus-selected-tree-face
 @vindex gnus-selected-tree-face
@@ -6982,7 +7053,7 @@ The @code{From} header.
 The number of the article.
 @item [
 The opening bracket.
-@item ] 
+@item ]
 The closing bracket.
 @item s
 The subject.
@@ -7003,7 +7074,7 @@ default is @code{((?[ . ?]) (?( . ?)) (?@{ . ?@}) (?< . ?>))}.
 @item gnus-tree-parent-child-edges
 @vindex gnus-tree-parent-child-edges
 This is a list that contains the characters used for connecting parent
-nodes to their children.  The default is @code{(?- ?\\ ?|)}. 
+nodes to their children.  The default is @code{(?- ?\\ ?|)}.
 
 @end table
 
@@ -7113,7 +7184,7 @@ disk forever and ever, never to return again.'' Use with caution.
 @cindex move mail
 @findex gnus-summary-move-article
 Move the article from one mail group to another
-(@code{gnus-summary-move-article}). 
+(@code{gnus-summary-move-article}).
 
 @item B c
 @kindex B c (Summary)
@@ -7163,7 +7234,13 @@ editing and make the changes permanent, type @kbd{C-c C-c}
 @findex gnus-summary-respool-query
 If you want to re-spool an article, you might be curious as to what group
 the article will end up in before you do the re-spooling.  This command
-will tell you (@code{gnus-summary-respool-query}). 
+will tell you (@code{gnus-summary-respool-query}).
+
+@item B t
+@kindex B t (Summary)
+@findex gnus-summary-respool-trace
+Similarly, this command will display all fancy splitting patterns used
+when repooling, if any (@code{gnus-summary-respool-trace}).
 
 @item B p
 @kindex B p (Summary)
@@ -7286,13 +7363,13 @@ Go to the Gnus info node (@code{gnus-info-find-node}).
 @kindex M-s (Summary)
 @findex gnus-summary-search-article-forward
 Search through all subsequent articles for a regexp
-(@code{gnus-summary-search-article-forward}). 
+(@code{gnus-summary-search-article-forward}).
 
 @item M-r
 @kindex M-r (Summary)
 @findex gnus-summary-search-article-backward
 Search through all previous articles for a regexp
-(@code{gnus-summary-search-article-backward}). 
+(@code{gnus-summary-search-article-backward}).
 
 @item &
 @kindex & (Summary)
@@ -7319,7 +7396,7 @@ the process mark (@code{gnus-summary-universal-argument}).
 @findex gnus-summary-prepare
 Regenerate the current summary buffer (@code{gnus-summary-prepare}).
 
-@item Y c 
+@item Y c
 @kindex Y c (Summary)
 @findex gnus-summary-insert-cached-articles
 Pull all cached articles (for the current group) into the summary buffer
@@ -7354,7 +7431,7 @@ several documents into one biiig group
 @code{nndoc} groups for each document, and then opening an
 @code{nnvirtual} group on top of these @code{nndoc} groups.  This
 command understands the process/prefix convention
-(@pxref{Process/Prefix}). 
+(@pxref{Process/Prefix}).
 
 @item C-t
 @kindex C-t (Summary)
@@ -7368,7 +7445,7 @@ to have truncation switched off while reading articles.
 @kindex = (Summary)
 @findex gnus-summary-expand-window
 Expand the summary buffer window (@code{gnus-summary-expand-window}).
-If given a prefix, force an @code{article} window configuration. 
+If given a prefix, force an @code{article} window configuration.
 
 @item M-C-e
 @kindex M-C-e (Summary)
@@ -7385,7 +7462,7 @@ group (@code{gnus-summary-edit-parameters}).
 @cindex exiting groups
 
 Exiting from the summary buffer will normally update all info on the
-group and return you to the group buffer. 
+group and return you to the group buffer.
 
 @table @kbd
 
@@ -7432,7 +7509,7 @@ Mark all articles, even the ticked ones, as read and then exit
 @kindex Z n (Summary)
 @findex gnus-summary-catchup-and-goto-next-group
 Mark all articles as read and go to the next group
-(@code{gnus-summary-catchup-and-goto-next-group}). 
+(@code{gnus-summary-catchup-and-goto-next-group}).
 
 @item Z R
 @kindex Z R (Summary)
@@ -7455,13 +7532,13 @@ articles, both read and unread.
 @kindex Z N (Summary)
 @findex gnus-summary-next-group
 Exit the group and go to the next group
-(@code{gnus-summary-next-group}). 
+(@code{gnus-summary-next-group}).
 
 @item Z P
 @kindex Z P (Summary)
 @findex gnus-summary-prev-group
 Exit the group and go to the previous group
-(@code{gnus-summary-prev-group}). 
+(@code{gnus-summary-prev-group}).
 
 @item Z s
 @kindex Z s (Summary)
@@ -7474,7 +7551,7 @@ command will make exit without updating (the @kbd{Q} command) worthless.
 
 @vindex gnus-exit-group-hook
 @code{gnus-exit-group-hook} is called when you exit the current
-group.  
+group.
 
 @findex gnus-summary-wake-up-the-dead
 @findex gnus-dead-summary-mode
@@ -7487,9 +7564,9 @@ something like @samp{*Dead Summary ... *} and install a minor mode
 called @code{gnus-dead-summary-mode}.  Now, if you switch back to this
 buffer, you'll find that all keys are mapped to a function called
 @code{gnus-summary-wake-up-the-dead}.  So tapping any keys in a dead
-summary buffer will result in a live, normal summary buffer.  
+summary buffer will result in a live, normal summary buffer.
 
-There will never be more than one dead summary buffer at any one time. 
+There will never be more than one dead summary buffer at any one time.
 
 @vindex gnus-use-cross-reference
 The data on the current group will be updated (which articles you have
@@ -7513,7 +7590,7 @@ posted it to several groups separately.  Posting the same article to
 several groups (not cross-posting) is called @dfn{spamming}, and you are
 by law required to send nasty-grams to anyone who perpetrates such a
 heinous crime.  You may want to try NoCeM handling to filter out spam
-(@pxref{NoCeM}). 
+(@pxref{NoCeM}).
 
 Remember: Cross-posting is kinda ok, but posting the same article
 separately to several groups is not.  Massive cross-posting (aka.
@@ -7562,14 +7639,14 @@ By default, Gnus tries to make sure that you don't have to read the same
 article more than once by utilizing the crossposting mechanism
 (@pxref{Crosspost Handling}).  However, that simple and efficient
 approach may not work satisfactory for some users for various
-reasons.  
+reasons.
 
 @enumerate
-@item 
+@item
 The @sc{nntp} server may fail to generate the @code{Xref} header.  This
 is evil and not very common.
 
-@item 
+@item
 The @sc{nntp} server may fail to include the @code{Xref} header in the
 @file{.overview} data bases.  This is evil and all too common, alas.
 
@@ -7615,7 +7692,7 @@ session are suppressed.
 @item gnus-duplicate-list-length
 @vindex gnus-duplicate-list-length
 This variable says how many @code{Message-ID}s to keep in the duplicate
-suppression list.  The default is 10000.  
+suppression list.  The default is 10000.
 
 @item gnus-duplicate-file
 @vindex gnus-duplicate-file
@@ -7739,15 +7816,15 @@ These conditions are:
 @table @code
 @item empty
 Remove all empty headers.
-@item newsgroups
-Remove the @code{Newsgroups} header if it only contains the current group
-name. 
 @item followup-to
 Remove the @code{Followup-To} header if it is identical to the
 @code{Newsgroups} header.
 @item reply-to
 Remove the @code{Reply-To} header if it lists the same address as the
 @code{From} header.
+@item newsgroups
+Remove the @code{Newsgroups} header if it only contains the current group
+name.
 @item date
 Remove the @code{Date} header if the article is less than three days
 old.
@@ -7757,11 +7834,11 @@ Remove the @code{To} header if it is very long.
 Remove all @code{To} headers if there are more than one.
 @end table
 
-To include the four first elements, you could say something like;
+To include the four three elements, you could say something like;
 
 @lisp
-(setq gnus-boring-article-headers 
-      '(empty newsgroups followup-to reply-to))
+(setq gnus-boring-article-headers
+      '(empty followup-to reply-to))
 @end lisp
 
 This is also the default value for this variable.
@@ -7826,17 +7903,20 @@ Any similarity to real events and people is purely coincidental.  Ahem.
 @vindex gnus-article-display-hook
 The @code{gnus-article-display-hook} is called after the article has
 been inserted into the article buffer.  It is meant to handle all
-treatment of the article before it is displayed. 
+treatment of the article before it is displayed.
 
 @findex gnus-article-maybe-highlight
-By default this hook just contains @code{gnus-article-hide-headers},
-@code{gnus-article-treat-overstrike}, and
-@code{gnus-article-maybe-highlight}, but there are thousands, nay
+@findex gnus-article-maybe-hide-headers
+By default this hook just contains
+@code{gnus-article-maybe-hide-headers},
+@code{gnus-hide-boring-headers}, @code{gnus-article-treat-overstrike},
+and @code{gnus-article-maybe-highlight} (and under XEmacs,
+@code{gnus-article-display-x-face}), but there are thousands, nay
 millions, of functions you can put in this hook.  For an overview of
 functions @pxref{Article Highlighting}, @pxref{Article Hiding},
 @pxref{Article Washing}, @pxref{Article Buttons} and @pxref{Article
 Date}.  Note that the order of functions in this hook might affect
-things, so you may have to fiddle a bit to get the desired results. 
+things, so you may have to fiddle a bit to get the desired results.
 
 You can, of course, write your own functions.  The functions are called
 from the article buffer, and you can do anything you like, pretty much.
@@ -7872,7 +7952,7 @@ Scroll backwards one page (@code{gnus-article-prev-page}).
 @kindex C-c ^ (Article)
 @findex gnus-article-refer-article
 If point is in the neighborhood of a @code{Message-ID} and you press
-@kbd{r}, Gnus will try to get that article from the server
+@kbd{C-c ^}, Gnus will try to get that article from the server
 (@code{gnus-article-refer-article}).
 
 @item C-c C-m
@@ -7891,7 +7971,7 @@ Reconfigure the buffers so that the summary buffer becomes visible
 @kindex ? (Article)
 @findex gnus-article-describe-briefly
 Give a very brief description of the available keystrokes
-(@code{gnus-article-describe-briefly}). 
+(@code{gnus-article-describe-briefly}).
 
 @item TAB
 @kindex TAB (Article)
@@ -7902,7 +7982,7 @@ only makes sense if you have buttonizing turned on.
 @item M-TAB
 @kindex M-TAB (Article)
 @findex gnus-article-prev-button
-Go to the previous button, if any (@code{gnus-article-prev-button}).  
+Go to the previous button, if any (@code{gnus-article-prev-button}).
 
 @end table
 
@@ -7938,19 +8018,20 @@ Hook called in article mode buffers.
 @item gnus-article-mode-syntax-table
 @vindex gnus-article-mode-syntax-table
 Syntax table used in article buffers.  It is initialized from
-@code{text-mode-syntax-table}. 
+@code{text-mode-syntax-table}.
 
 @vindex gnus-article-mode-line-format
 @item gnus-article-mode-line-format
 This variable is a format string along the same lines as
-@code{gnus-summary-mode-line-format}.  It accepts the same
-format specifications as that variable, with one extension:
+@code{gnus-summary-mode-line-format} (@pxref{Mode Line Formatting}).  It
+accepts the same format specifications as that variable, with one
+extension:
 
 @table @samp
 @item w
 The @dfn{wash status} of the article.  This is a short string with one
 character for each possible article wash operation that may have been
-performed. 
+performed.
 @end table
 
 @vindex gnus-break-pages
@@ -7986,12 +8067,13 @@ Manual}.  If you are in a foreign news group, and you wish to post the
 article using the foreign server, you can give a prefix to @kbd{C-c C-c}
 to make Gnus try to post using the foreign server.
 
-@menu 
+@menu
 * Mail::                 Mailing and replying.
 * Post::                 Posting and following up.
 * Posting Server::       What server should you post via?
 * Mail and Post::        Mailing and posting at the same time.
 * Archived Messages::    Where Gnus stores the messages you've sent.
+* Posting Styles::       An easier way to specify who you are.
 * Drafts::               Postponing messages and rejected messages.
 * Rejected Articles::    What happens if the server doesn't like your article?
 @end menu
@@ -8070,11 +8152,16 @@ can use a non-zero prefix to the @kbd{C-c C-c} command to force using
 the ``current'' server for posting.
 
 If you give a zero prefix (i.e., @kbd{C-u 0 C-c C-c}) to that command,
-Gnus will prompt you for what method to use for posting.  
+Gnus will prompt you for what method to use for posting.
 
 You can also set @code{gnus-post-method} to a list of select methods.
 If that's the case, Gnus will always prompt you for what method to use
-for posting. 
+for posting.
+
+Finally, if you want to always post using the same select method as
+you're reading from (which might be convenient if you're reading lots of
+groups from different private servers), you can set this variable to
+@code{current}. 
 
 
 @node Mail and Post
@@ -8107,7 +8194,7 @@ spell-checking via the @code{ispell} package:
 @cindex ispell
 @findex ispell-message
 @lisp
-(add-hook 'message-send-hook 'ispell-message) 
+(add-hook 'message-send-hook 'ispell-message)
 @end lisp
 
 
@@ -8141,7 +8228,7 @@ directory chosen, you could say something like:
 
 @lisp
 (setq gnus-message-archive-method
-      '(nnfolder "archive" 
+      '(nnfolder "archive"
                  (nnfolder-inhibit-expiry t)
                  (nnfolder-active-file "~/News/sent-mail/active")
                  (nnfolder-directory "~/News/sent-mail/")))
@@ -8151,7 +8238,7 @@ directory chosen, you could say something like:
 @cindex Gcc
 Gnus will insert @code{Gcc} headers in all outgoing messages that point
 to one or more group(s) on that server.  Which group to use is
-determined by the @code{gnus-message-archive-group} variable.  
+determined by the @code{gnus-message-archive-group} variable.
 
 This variable can be used to do the following:
 
@@ -8180,7 +8267,7 @@ Saving to two groups, @samp{MisK} and @samp{safe}:
 
 Save to different groups based on what group you are in:
 @lisp
-(setq gnus-message-archive-group 
+(setq gnus-message-archive-group
       '(("^alt" "sent-to-alt")
         ("mail" "sent-to-mail")
         (".*" "sent-to-misc")))
@@ -8188,11 +8275,11 @@ Save to different groups based on what group you are in:
 
 More complex stuff:
 @lisp
-(setq gnus-message-archive-group 
+(setq gnus-message-archive-group
       '((if (message-news-p)
-            "misc-news" 
+            "misc-news"
           "misc-mail")))
-@end lisp       
+@end lisp
 
 How about storing all news messages in one file, but storing all mail
 messages in one file per month:
@@ -8200,8 +8287,8 @@ messages in one file per month:
 @lisp
 (setq gnus-message-archive-group
       '((if (message-news-p)
-            "misc-news" 
-          (concat "mail." (format-time-string 
+            "misc-news"
+          (concat "mail." (format-time-string
                            "%Y-%m" (current-time))))))
 @end lisp
 
@@ -8225,8 +8312,8 @@ case you should set @code{gnus-message-archive-group} to @code{nil};
 this will disable archiving.
 
 @table @code
-@item gnus-outgoing-message-group 
-@vindex gnus-outgoing-message-group 
+@item gnus-outgoing-message-group
+@vindex gnus-outgoing-message-group
 All outgoing messages will be put in this group.  If you want to store
 all your outgoing mail and articles in the group @samp{nnml:archive},
 you set this variable to that value.  This variable can also be a list of
@@ -8242,83 +8329,84 @@ but the latter is the preferred method.
 @end table
 
 
-@c @node Posting Styles
-@c @section Posting Styles
-@c @cindex posting styles
-@c @cindex styles
-@c 
-@c All them variables, they make my head swim.  
-@c 
-@c So what if you want a different @code{Organization} and signature based
-@c on what groups you post to?  And you post both from your home machine
-@c and your work machine, and you want different @code{From} lines, and so
-@c on? 
-@c 
-@c @vindex gnus-posting-styles
-@c One way to do stuff like that is to write clever hooks that change the
-@c variables you need to have changed.  That's a bit boring, so somebody
-@c came up with the bright idea of letting the user specify these things in
-@c a handy alist.  Here's an example of a @code{gnus-posting-styles}
-@c variable: 
-@c 
-@c @lisp
-@c ((".*" 
-@c   (signature . "Peace and happiness")
-@c   (organization . "What me?"))
-@c  ("^comp" 
-@c   (signature . "Death to everybody"))
-@c  ("comp.emacs.i-love-it" 
-@c   (organization . "Emacs is it")))
-@c @end lisp
-@c 
-@c As you might surmise from this example, this alist consists of several
-@c @dfn{styles}.  Each style will be applicable if the first element
-@c ``matches'', in some form or other.  The entire alist will be iterated
-@c over, from the beginning towards the end, and each match will be
-@c applied, which means that attributes in later styles that match override
-@c the same attributes in earlier matching styles.  So
-@c @samp{comp.programming.literate} will have the @samp{Death to everybody}
-@c signature and the @samp{What me?} @code{Organization} header.
-@c 
-@c The first element in each style is called the @code{match}.  If it's a
-@c string, then Gnus will try to regexp match it against the group name.
-@c If it's a function symbol, that function will be called with no
-@c arguments.  If it's a variable symbol, then the variable will be
-@c referenced.  If it's a list, then that list will be @code{eval}ed.  In
-@c any case, if this returns a non-@code{nil} value, then the style is said
-@c to @dfn{match}.
-@c 
-@c Each style may contain a arbitrary amount of @dfn{attributes}.  Each
-@c attribute consists of a @var{(name . value)} pair.  The attribute name
-@c can be one of @code{signature}, @code{organization} or @code{from}.  The
-@c attribute name can also be a string.  In that case, this will be used as
-@c a header name, and the value will be inserted in the headers of the
-@c article.
-@c 
-@c The attribute value can be a string (used verbatim), a function (the
-@c return value will be used), a variable (its value will be used) or a
-@c list (it will be @code{eval}ed and the return value will be used).
-@c 
-@c So here's a new example:
-@c 
-@c @lisp
-@c (setq gnus-posting-styles
-@c       '((".*" 
-@c           (signature . "~/.signature") 
-@c           (from . "user@@foo (user)")
-@c           ("X-Home-Page" . (getenv "WWW_HOME"))
-@c           (organization . "People's Front Against MWM"))
-@c         ("^rec.humor" 
-@c           (signature . my-funny-signature-randomizer))
-@c         ((equal (system-name) "gnarly")
-@c           (signature . my-quote-randomizer))
-@c         (posting-from-work-p
-@c           (signature . "~/.work-signature")
-@c           (from . "user@@bar.foo (user)")
-@c           (organization . "Important Work, Inc"))
-@c         ("^nn.+:" 
-@c           (signature . "~/.mail-signature"))))
-@c @end lisp
+@node Posting Styles
+@section Posting Styles
+@cindex posting styles
+@cindex styles
+
+All them variables, they make my head swim.
+
+So what if you want a different @code{Organization} and signature based
+on what groups you post to?  And you post both from your home machine
+and your work machine, and you want different @code{From} lines, and so
+on?
+
+@vindex gnus-posting-styles
+One way to do stuff like that is to write clever hooks that change the
+variables you need to have changed.  That's a bit boring, so somebody
+came up with the bright idea of letting the user specify these things in
+a handy alist.  Here's an example of a @code{gnus-posting-styles}
+variable:
+
+@lisp
+((".*"
+  (signature "Peace and happiness")
+  (organization "What me?"))
+ ("^comp"
+  (signature "Death to everybody"))
+ ("comp.emacs.i-love-it"
+  (organization "Emacs is it")))
+@end lisp
+
+As you might surmise from this example, this alist consists of several
+@dfn{styles}.  Each style will be applicable if the first element
+``matches'', in some form or other.  The entire alist will be iterated
+over, from the beginning towards the end, and each match will be
+applied, which means that attributes in later styles that match override
+the same attributes in earlier matching styles.  So
+@samp{comp.programming.literate} will have the @samp{Death to everybody}
+signature and the @samp{What me?} @code{Organization} header.
+
+The first element in each style is called the @code{match}.  If it's a
+string, then Gnus will try to regexp match it against the group name.
+If it's a function symbol, that function will be called with no
+arguments.  If it's a variable symbol, then the variable will be
+referenced.  If it's a list, then that list will be @code{eval}ed.  In
+any case, if this returns a non-@code{nil} value, then the style is said
+to @dfn{match}.
+
+Each style may contain a arbitrary amount of @dfn{attributes}.  Each
+attribute consists of a @var{(name . value)} pair.  The attribute name
+can be one of @code{signature}, @code{signature-file},
+@code{organization}, @code{address} or @code{name}.  The attribute name
+can also be a string.  In that case, this will be used as a header name,
+and the value will be inserted in the headers of the article.
+
+The attribute value can be a string (used verbatim), a function (the
+return value will be used), a variable (its value will be used) or a
+list (it will be @code{eval}ed and the return value will be used).
+
+So here's a new example:
+
+@lisp
+(setq gnus-posting-styles
+      '((".*"
+         (signature-file "~/.signature")
+         (name "User Name")
+         ("X-Home-Page" (getenv "WWW_HOME"))
+         (organization "People's Front Against MWM"))
+        ("^rec.humor"
+         (signature my-funny-signature-randomizer))
+        ((equal (system-name) "gnarly")
+         (signature my-quote-randomizer))
+        (posting-from-work-p
+         (signature-file "~/.work-signature")
+         (address "user@@bar.foo")
+         (organization "Important Work, Inc"))
+        ("^nn.+:"
+         (signature-file "~/.mail-signature"))))
+@end lisp
+
 
 @node Drafts
 @section Drafts
@@ -8335,7 +8423,7 @@ some sort using the Gnus mail and post commands, the buffer you get will
 automatically associate to an article in a special @dfn{draft} group.
 If you save the buffer the normal way (@kbd{C-x C-s}, for instance), the
 article will be saved there.  (Auto-save files also go to the draft
-group.) 
+group.)
 
 @cindex nndraft
 @vindex nndraft-directory
@@ -8348,7 +8436,7 @@ read---all articles in the group are permanently unread.
 
 If the group doesn't exist, it will be created and you'll be subscribed
 to it.  The only way to make it disappear from the Group buffer is to
-unsubscribe it. 
+unsubscribe it.
 
 @c @findex gnus-dissociate-buffer-from-draft
 @c @kindex C-c M-d (Mail)
@@ -8364,10 +8452,10 @@ unsubscribe it.
 @c (@code{gnus-dissociate-buffer-from-draft}) command does that for you.
 @c If you change your mind and want to turn the auto-saving back on again,
 @c @kbd{C-c C-d} (@code{gnus-associate-buffer-with-draft} does that.
-@c 
+@c
 @c @vindex gnus-use-draft
 @c To leave association with the draft group off by default, set
-@c @code{gnus-use-draft} to @code{nil}.  It is @code{t} by default. 
+@c @code{gnus-use-draft} to @code{nil}.  It is @code{t} by default.
 
 @findex gnus-draft-edit-message
 @kindex D e (Draft)
@@ -8504,7 +8592,7 @@ variable, with some simple extensions:
 
 @table @samp
 
-@item h 
+@item h
 How the news is fetched---the backend name.
 
 @item n
@@ -8519,8 +8607,8 @@ The opened/closed/denied status of the server.
 
 @vindex gnus-server-mode-line-format
 The mode line can also be customized by using the
-@code{gnus-server-mode-line-format} variable.  The following specs are
-understood: 
+@code{gnus-server-mode-line-format} variable (@pxref{Mode Line
+Formatting}).  The following specs are understood:
 
 @table @samp
 @item S
@@ -8584,7 +8672,7 @@ List all servers (@code{gnus-server-list-servers}).
 @findex gnus-server-scan-server
 Request that the server scan its sources for new articles
 (@code{gnus-server-scan-server}).  This is mainly sensible with mail
-servers. 
+servers.
 
 @item g
 @kindex g (Server)
@@ -8599,7 +8687,7 @@ a mail backend that has gotten out of synch.
 @node Example Methods
 @subsection Example Methods
 
-Most select methods are pretty simple and self-explanatory: 
+Most select methods are pretty simple and self-explanatory:
 
 @lisp
 (nntp "news.funet.fi")
@@ -8613,7 +8701,7 @@ Reading directly from the spool is even simpler:
 
 As you can see, the first element in a select method is the name of the
 backend, and the second is the @dfn{address}, or @dfn{name}, if you
-will. 
+will.
 
 After these two elements, there may be an arbitrary number of
 @var{(variable form)} pairs.
@@ -8644,8 +8732,8 @@ that.)
 Here's the method for a public spool:
 
 @lisp
-(nnmh "public" 
-      (nnmh-directory "/usr/information/spool/") 
+(nnmh "public"
+      (nnmh-directory "/usr/information/spool/")
       (nnmh-get-new-mail nil))
 @end lisp
 
@@ -8664,6 +8752,24 @@ should probably look something like this:
        ("telnet" "the.real.nntp.host" "nntp")))
 @end lisp
 
+If you want to use the wonderful @code{ssh} program to provide a
+compressed connection over the modem line, you could create a virtual
+server that would look something like this:
+
+@lisp
+(nntp "news"
+       (nntp-address "copper.uio.no")
+       (nntp-rlogin-program "ssh")
+       (nntp-open-connection-function nntp-open-rlogin)
+       (nntp-end-of-line "\n")
+       (nntp-rlogin-parameters
+        ("telnet" "news.uio.no" "nntp")))
+@end lisp
+
+This means that you have to have set up @code{ssh-agent} correctly to
+provide automatic authorization, of course.  And to get a compressed
+connection, you have to have the @samp{Compression} option in the
+@code{ssh} @file{config} file.
 
 
 @node Creating a Virtual Server
@@ -8721,7 +8827,7 @@ variables for each backend, see each backend's section later in this
 manual, but here's an example @code{nnml} definition:
 
 @lisp
-(nnml "public" 
+(nnml "public"
       (nnml-directory "~/my-mail/")
       (nnml-active-file "~/my-mail/active")
       (nnml-newsgroups-file "~/my-mail/newsgroups"))
@@ -8780,25 +8886,25 @@ Close the connection (if any) to the server
 @kindex D (Server)
 @findex gnus-server-deny-server
 Mark the current server as unreachable
-(@code{gnus-server-deny-server}). 
+(@code{gnus-server-deny-server}).
 
 @item M-o
 @kindex M-o (Server)
 @findex gnus-server-open-all-servers
 Open the connections to all servers in the buffer
-(@code{gnus-server-open-all-servers}). 
+(@code{gnus-server-open-all-servers}).
 
 @item M-c
 @kindex M-c (Server)
 @findex gnus-server-close-all-servers
 Close the connections to all servers in the buffer
-(@code{gnus-server-close-all-servers}). 
+(@code{gnus-server-close-all-servers}).
 
 @item R
 @kindex R (Server)
 @findex gnus-server-remove-denials
 Remove all marks to whether Gnus was denied connection from any servers
-(@code{gnus-server-remove-denials}). 
+(@code{gnus-server-remove-denials}).
 
 @end table
 
@@ -8836,7 +8942,7 @@ fact, you can subscribe to the same group from as many different servers
 you feel like.  There will be no name collisions.
 
 The following variables can be used to create a virtual @code{nntp}
-server: 
+server:
 
 @table @code
 
@@ -8854,15 +8960,18 @@ default it sends the command @code{MODE READER} to the server with the
 @code{nntp-send-mode-reader} function.  This function should always be
 present in this hook.
 
-@item nntp-authinfo-function 
-@vindex nntp-authinfo-function 
+@item nntp-authinfo-function
+@vindex nntp-authinfo-function
 @findex nntp-send-authinfo
+@vindex nntp-authinfo-file
 This function will be used to send @samp{AUTHINFO} to the @sc{nntp}
 server.  The default function is @code{nntp-send-authinfo}, which looks
-through your @file{~/.netrc} for applicable entries.  If none are found,
-it will prompt you for a login name and a password.  The format of the
-@file{~/.netrc} file is defined in the @code{ftp} manual page, but here
-are the salient facts:
+through your @file{~/.authinfo} (or whatever you've set the
+@code{nntp-authinfo-file} variable to) for applicable entries.  If none
+are found, it will prompt you for a login name and a password.  The
+format of the @file{~/.authinfo} file is (almost) the same as the
+@code{ftp} @file{~/.netrc} file, which is defined in the @code{ftp}
+manual page, but here are the salient facts:
 
 @enumerate
 @item
@@ -8870,7 +8979,11 @@ The file contains one or more line, each of which define one server.
 
 @item
 Each line may contain an arbitrary number of token/value pairs.  The
-valid tokens include @samp{machine}, @samp{login}, and @samp{password}.
+valid tokens include @samp{machine}, @samp{login}, @samp{password},
+@samp{default} and @samp{force}.  (The latter is not a valid
+@file{.netrc}/@code{ftp} token, which is the only way the
+@file{.authinfo} file format deviates from the @file{.netrc} file
+format.)
 
 @end enumerate
 
@@ -8878,7 +8991,7 @@ Here's an example file:
 
 @example
 machine news.uio.no login larsi password geheimnis
-machine nntp.ifi.uio.no login larsi
+machine nntp.ifi.uio.no login larsi force yes
 @end example
 
 The token/value pairs may appear in any order; @samp{machine} doesn't
@@ -8886,12 +8999,26 @@ have to be first, for instance.
 
 In this example, both login name and password have been supplied for the
 former server, while the latter has only the login name listed, and the
-user will be prompted for the password.
+user will be prompted for the password.  The latter also has the
+@samp{force} tag, which means that the authinfo will be sent to the
+@var{nntp} server upon connection; the default (i.e., when there is not
+@samp{force} tag) is to not send authinfo to the @var{nntp} server
+until the @var{nntp} server asks for it.
 
-Remember to not leave the @file{~/.netrc} world-readable.
+You can also add @samp{default} lines that will apply to all servers
+that don't have matching @samp{machine} lines.
 
-@item nntp-server-action-alist 
-@vindex nntp-server-action-alist 
+@example
+default force yes
+@end example
+
+This will force sending @samp{AUTHINFO} commands to all servers not
+previously mentioned.
+
+Remember to not leave the @file{~/.authinfo} file world-readable.
+
+@item nntp-server-action-alist
+@vindex nntp-server-action-alist
 This is a list of regexps to match on server types and actions to be
 taken when matches are made.  For instance, if you want Gnus to beep
 every time you connect to innd, you could say something like:
@@ -8906,12 +9033,12 @@ You probably don't want to do that, though.
 The default value is
 
 @lisp
-'(("nntpd 1\\.5\\.11t" 
+'(("nntpd 1\\.5\\.11t"
    (remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)))
 @end lisp
 
 This ensures that Gnus doesn't send the @code{MODE READER} command to
-nntpd 1.5.11t, since that command chokes that server, I've been told. 
+nntpd 1.5.11t, since that command chokes that server, I've been told.
 
 @item nntp-maximum-request
 @vindex nntp-maximum-request
@@ -8922,17 +9049,17 @@ waiting for reply, and then reads all the replies.  This is controlled
 by the @code{nntp-maximum-request} variable, and is 400 by default.  If
 your network is buggy, you should set this to 1.
 
-@item nntp-connection-timeout
-@vindex nntp-connection-timeout
-If you have lots of foreign @code{nntp} groups that you connect to
-regularly, you're sure to have problems with @sc{nntp} servers not
-responding properly, or being too loaded to reply within reasonable
-time.  This is can lead to awkward problems, which can be helped
-somewhat by setting @code{nntp-connection-timeout}.  This is an integer
-that says how many seconds the @code{nntp} backend should wait for a
-connection before giving up.  If it is @code{nil}, which is the default,
-no timeouts are done.
-
+@c @item nntp-connection-timeout
+@c @vindex nntp-connection-timeout
+@c If you have lots of foreign @code{nntp} groups that you connect to
+@c regularly, you're sure to have problems with @sc{nntp} servers not
+@c responding properly, or being too loaded to reply within reasonable
+@c time.  This is can lead to awkward problems, which can be helped
+@c somewhat by setting @code{nntp-connection-timeout}.  This is an integer
+@c that says how many seconds the @code{nntp} backend should wait for a
+@c connection before giving up.  If it is @code{nil}, which is the default,
+@c no timeouts are done.
+@c 
 @c @item nntp-command-timeout
 @c @vindex nntp-command-timeout
 @c @cindex PPP connections
@@ -8946,7 +9073,7 @@ no timeouts are done.
 @c number of seconds, shut down the connection, start a new one, and resend
 @c the command.  This should hopefully be transparent to the user.  A
 @c likely number is 30 seconds.
-@c 
+@c
 @c @item nntp-retry-on-break
 @c @vindex nntp-retry-on-break
 @c If this variable is non-@code{nil}, you can also @kbd{C-g} if Gnus
@@ -8963,21 +9090,25 @@ server.
 @findex nntp-open-network-stream
 @item nntp-open-connection-function
 @vindex nntp-open-connection-function
-This function is used to connect to the remote system.  Three pre-made
-functions are @code{nntp-open-network-stream}, which is the default, and
-simply connects to some port or other on the remote system.  The other
-two are @code{nntp-open-rlogin}, which does an @samp{rlogin} on the
+This function is used to connect to the remote system.  Four pre-made
+functions are supplied:
+
+@table @code
+@item nntp-open-network-stream
+This is the default, and simply connects to some port or other on the
+remote system.
+
+@item nntp-open-rlogin
+Does an @samp{rlogin} on the
 remote system, and then does a @samp{telnet} to the @sc{nntp} server
-available there, and @code{nntp-open-telnet}, which does a @samp{telnet}
-to the remote system and then another @samp{telnet} to get to the
-@sc{nntp} server.
+available there.
 
 @code{nntp-open-rlogin}-related variables:
 
 @table @code
 
-@item nntp-rlogin-program 
-@vindex nntp-rlogin-program 
+@item nntp-rlogin-program
+@vindex nntp-rlogin-program
 Program used to log in on remote machines.  The default is @samp{rsh},
 but @samp{ssh} is a popular alternative.
 
@@ -8991,6 +9122,10 @@ User name on the remote system.
 
 @end table
 
+@item nntp-open-telnet
+Does a @samp{telnet} to the remote system and then another @samp{telnet}
+to get to the @sc{nntp} server.
+
 @code{nntp-open-telnet}-related variables:
 
 @table @code
@@ -9028,6 +9163,27 @@ This works for Solaris @code{telnet}, for instance.
 
 @end table
 
+@findex nntp-open-ssl-stream
+@item nntp-open-ssl-stream
+Opens a connection to a server over a @dfn{secure} channel.  To use this
+you must have SSLay installed
+(@file{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL}, and you also need
+@file{ssl.el} (from the W3 distributeion, for instance).  You then
+define a server as follows:
+
+@lisp
+;; Type `C-c C-c' after you've finished editing.
+;;
+;; "snews" is port 563 and is predefined in our /etc/services
+;;
+(nntp "snews.bar.com"
+      (nntp-open-connection-function nntp-open-ssl-stream)
+      (nntp-port-number "snews")
+      (nntp-address "snews.bar.com"))
+@end lisp
+
+@end table
+
 @item nntp-end-of-line
 @vindex nntp-end-of-line
 String to use as end-of-line marker when talking to the @sc{nntp}
@@ -9037,7 +9193,7 @@ using @code{rlogin} to talk to the server.
 @item nntp-rlogin-user-name
 @vindex nntp-rlogin-user-name
 User name on the remote system when using the @code{rlogin} connect
-function. 
+function.
 
 @item nntp-address
 @vindex nntp-address
@@ -9052,8 +9208,8 @@ connect function.
 @vindex nntp-buggy-select
 Set this to non-@code{nil} if your select routine is buggy.
 
-@item nntp-nov-is-evil 
-@vindex nntp-nov-is-evil 
+@item nntp-nov-is-evil
+@vindex nntp-nov-is-evil
 If the @sc{nntp} server does not support @sc{nov}, you could set this
 variable to @code{t}, but @code{nntp} usually checks automatically whether @sc{nov}
 can be used.
@@ -9064,7 +9220,7 @@ can be used.
 @cindex XOVER
 List of strings used as commands to fetch @sc{nov} lines from a
 server.  The default value of this variable is @code{("XOVER"
-"XOVERVIEW")}. 
+"XOVERVIEW")}.
 
 @item nntp-nov-gap
 @vindex nntp-nov-gap
@@ -9088,6 +9244,13 @@ A hook run before attempting to connect to an @sc{nntp} server.
 If this variable is non-@code{nil}, some noise will be made when a
 server closes connection.
 
+@item nntp-record-commands
+@vindex nntp-record-commands
+If non-@code{nil}, @code{nntp} will log all commands it sends to the
+@sc{nntp} server (along with a timestep) in the @samp{*nntp-log*}
+buffer.  This is useful if you are debugging a Gnus/@sc{nntp} connection
+that doesn't seem to work.
+
 @end table
 
 
@@ -9099,7 +9262,7 @@ server closes connection.
 Subscribing to a foreign group from the local spool is extremely easy,
 and might be useful, for instance, to speed up reading groups that
 contain very big articles---@samp{alt.binaries.pictures.furniture}, for
-instance. 
+instance.
 
 Anyways, you just specify @code{nnspool} as the method and @code{""} (or
 anything else) as the address.
@@ -9117,15 +9280,15 @@ Program used to post an article.
 
 @item nnspool-inews-switches
 @vindex nnspool-inews-switches
-Parameters given to the inews program when posting an article. 
+Parameters given to the inews program when posting an article.
 
 @item nnspool-spool-directory
 @vindex nnspool-spool-directory
 Where @code{nnspool} looks for the articles.  This is normally
 @file{/usr/spool/news/}.
 
-@item nnspool-nov-directory 
-@vindex nnspool-nov-directory 
+@item nnspool-nov-directory
+@vindex nnspool-nov-directory
 Where @code{nnspool} will look for @sc{nov} files.  This is normally
 @file{/usr/spool/news/over.view/}.
 
@@ -9224,7 +9387,7 @@ last group.
 
 This should be sufficient for reading mail with Gnus.  You might want to
 give the other sections in this part of the manual a perusal, though.
-Especially @pxref{Choosing a Mail Backend} and @pxref{Expiring Mail}. 
+Especially @pxref{Choosing a Mail Backend} and @pxref{Expiring Mail}.
 
 
 @node Splitting Mail
@@ -9255,10 +9418,6 @@ insert sub-expressions from the matched text.  For instance:
 ("list.\\1" "From:.*\\(.*\\)-list@@majordomo.com")
 @end lisp
 
-If the first element is the special symbol @code{junk}, then messages
-that match the regexp will disappear into the aether.  Use with
-extreme caution. 
-
 The second element can also be a function.  In that case, it will be
 called narrowed to the headers with the first element of the rule as the
 argument.  It should return a non-@code{nil} value if it thinks that the
@@ -9295,7 +9454,7 @@ that no articles are crossposted to the general (@samp{}) group.
 the crossposted articles.  However, not all file systems support hard
 links.  If that's the case for you, set
 @code{nnmail-crosspost-link-function} to @code{copy-file}.  (This
-variable is @code{add-name-to-file} by default.)  
+variable is @code{add-name-to-file} by default.)
 
 @kindex M-x nnmail-split-history
 @kindex nnmail-split-history
@@ -9403,10 +9562,10 @@ is done).  Here's and example of using these two hooks to change the
 default file modes the new mail files get:
 
 @lisp
-(add-hook 'gnus-pre-get-new-mail-hook 
+(add-hook 'gnus-pre-get-new-mail-hook
           (lambda () (set-default-file-modes 511)))
 
-(add-hook 'gnus-post-get-new-mail-hook 
+(add-hook 'gnus-post-get-new-mail-hook
           (lambda () (set-default-file-modes 551)))
 @end lisp
 
@@ -9457,7 +9616,7 @@ the same group will end up in @file{mail/misc}.
 @item nnmail-delete-file-function
 @vindex nnmail-delete-file-function
 @findex delete-file
-Function called to delete files.  It is @code{delete-file} by default. 
+Function called to delete files.  It is @code{delete-file} by default.
 
 @item nnmail-cache-accepted-message-ids
 @vindex nnmail-cache-accepted-message-ids
@@ -9508,8 +9667,10 @@ the five possible split syntaxes:
 
 @enumerate
 
-@item 
-@samp{group}: If the split is a string, that will be taken as a group name. 
+@item
+@samp{group}: If the split is a string, that will be taken as a group
+name.  Normal regexp match expansion will be done.  See below for
+examples. 
 
 @item
 @var{(FIELD VALUE SPLIT)}: If the split is a list, the first element of
@@ -9526,9 +9687,9 @@ be stored in one or more groups.
 @var{(& SPLIT...)}: If the split is a list, and the first element is
 @code{&}, then process all SPLITs in the list.
 
-@item 
+@item
 @code{junk}: If the split is the symbol @code{junk}, then don't save
-this message.
+this message. Use with extreme caution.
 
 @item
 @var{(: function arg1 arg2 ...)}:  If the split is a list, and the first
@@ -9536,6 +9697,9 @@ element is @code{:}, then the second element will be called as a
 function with @var{args} given as arguments.  The function should return
 a SPLIT.
 
+@item
+@code{nil}: If the split is @code{nil}, it is ignored.
+
 @end enumerate
 
 In these splits, @var{FIELD} must match a complete field name.
@@ -9557,12 +9721,18 @@ when all this splitting is performed.
 
 If you want to have Gnus create groups dynamically based on some
 information in the headers (i.e., do @code{replace-match}-like
-substitions in the group names), you can say things like:
+substitutions in the group names), you can say things like:
 
 @example
-(any "debian-\\(\\w*\\)@@lists.debian.org" "mail.debian.\\1")
+(any "debian-\\b\\(\\w+\\)@@lists.debian.org" "mail.debian.\\1")
 @end example
 
+If the string contains the element @samp{\&}, then the previously
+matched string will be substituted.  Similarly, the elements @samp{\\1}
+up to @samp{\\9} will be substituted with the text matched by the
+groupings 1 through 9.
+
+
 @node Mail and Procmail
 @subsection Mail and Procmail
 @cindex procmail
@@ -9671,18 +9841,18 @@ Here's how:
 @item
 Go to the group buffer.
 
-@item 
+@item
 Type `G f' and give the path to the mbox file when prompted to create an
 @code{nndoc} group from the mbox file (@pxref{Foreign Groups}).
 
-@item 
+@item
 Type `SPACE' to enter the newly created group.
 
 @item
 Type `M P b' to process-mark all articles in this group's buffer
 (@pxref{Setting Process Marks}).
 
-@item 
+@item
 Type `B r' to respool all the process-marked articles, and answer
 @samp{nnml} when prompted (@pxref{Mail Group Commands}).
 @end enumerate
@@ -9738,8 +9908,8 @@ automatically, you can put something like the following in your
 
 @vindex gnus-mark-article-hook
 @lisp
-(remove-hook 'gnus-mark-article-hook                                
-             'gnus-summary-mark-read-and-unread-as-read)            
+(remove-hook 'gnus-mark-article-hook
+             'gnus-summary-mark-read-and-unread-as-read)
 (add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
 @end lisp
 
@@ -9753,16 +9923,16 @@ Let's say you subscribe to a couple of mailing lists, and you want the
 articles you have read to disappear after a while:
 
 @lisp
-(setq gnus-auto-expirable-newsgroups 
+(setq gnus-auto-expirable-newsgroups
       "mail.nonsense-list\\|mail.nice-list")
 @end lisp
 
 Another way to have auto-expiry happen is to have the element
-@code{auto-expire} in the group parameters of the group. 
+@code{auto-expire} in the group parameters of the group.
 
 If you use adaptive scoring (@pxref{Adaptive Scoring}) and
 auto-expiring, you'll have problems.  Auto-expiring and adaptive scoring
-don't really mix very well.  
+don't really mix very well.
 
 @vindex nnmail-expiry-wait
 The @code{nnmail-expiry-wait} variable supplies the default time an
@@ -9821,7 +9991,7 @@ wrong group and all your important mail has disappeared.  Be a
 @emph{man}!  Or a @emph{woman}!  Whatever you feel more comfortable
 with!  So there!
 
-Most people make most of their mail groups total-expirable, though. 
+Most people make most of their mail groups total-expirable, though.
 
 
 @node Washing Mail
@@ -9870,7 +10040,7 @@ cleaning up the headers.  Functions that can be used include:
 @item nnmail-remove-leading-whitespace
 @findex nnmail-remove-leading-whitespace
 Clear leading white space that ``helpful'' listservs have added to the
-headers to make them look nice.  Aaah.  
+headers to make them look nice.  Aaah.
 
 @item nnmail-remove-list-identifiers
 @findex nnmail-remove-list-identifiers
@@ -9890,14 +10060,14 @@ For instance, if you want to remove the @samp{(idm)} and the
 
 @item nnmail-remove-tabs
 @findex nnmail-remove-tabs
-Translate all @samp{TAB} characters into @samp{SPACE} characters. 
+Translate all @samp{TAB} characters into @samp{SPACE} characters.
 
 @end table
 
 @item nnmail-prepare-incoming-message-hook
 @vindex nnmail-prepare-incoming-message-hook
 This hook is called narrowed to each message.  Functions to be used
-include: 
+include:
 
 @table @code
 @item article-de-quoted-unreadable
@@ -9953,7 +10123,7 @@ methods:
 
 Or something like:
 @lisp
-(setq nnmail-split-methods 
+(setq nnmail-split-methods
       '(("duplicates" "^Gnus-Warning:")
         ;; Other rules.
         [...]))
@@ -10025,7 +10195,7 @@ Virtual server settings:
 @table @code
 @item nnmbox-mbox-file
 @vindex nnmbox-mbox-file
-The name of the mail box in the user's home directory. 
+The name of the mail box in the user's home directory.
 
 @item nnmbox-active-file
 @vindex nnmbox-active-file
@@ -10062,7 +10232,7 @@ The name of the active file for the rmail box.
 
 @item nnbabyl-get-new-mail
 @vindex nnbabyl-get-new-mail
-If non-@code{nil}, @code{nnbabyl} will read incoming mail. 
+If non-@code{nil}, @code{nnbabyl} will read incoming mail.
 @end table
 
 
@@ -10102,7 +10272,7 @@ Virtual server settings:
 @table @code
 @item nnml-directory
 @vindex nnml-directory
-All @code{nnml} directories will be placed under this directory. 
+All @code{nnml} directories will be placed under this directory.
 
 @item nnml-active-file
 @vindex nnml-active-file
@@ -10111,7 +10281,7 @@ The active file for the @code{nnml} server.
 @item nnml-newsgroups-file
 @vindex nnml-newsgroups-file
 The @code{nnml} group descriptions file.  @xref{Newsgroups File
-Format}. 
+Format}.
 
 @item nnml-get-new-mail
 @vindex nnml-get-new-mail
@@ -10119,11 +10289,11 @@ If non-@code{nil}, @code{nnml} will read incoming mail.
 
 @item nnml-nov-is-evil
 @vindex nnml-nov-is-evil
-If non-@code{nil}, this backend will ignore any @sc{nov} files.  
+If non-@code{nil}, this backend will ignore any @sc{nov} files.
 
 @item nnml-nov-file-name
 @vindex nnml-nov-file-name
-The name of the @sc{nov} files.  The default is @file{.overview}. 
+The name of the @sc{nov} files.  The default is @file{.overview}.
 
 @item nnml-prepare-save-mail-hook
 @vindex nnml-prepare-save-mail-hook
@@ -10138,7 +10308,7 @@ nnml-generate-nov-databases}.  This command will trawl through the
 entire @code{nnml} hierarchy, looking at each and every article, so it
 might take a while to complete.  A better interface to this
 functionality can be found in the server buffer (@pxref{Server
-Commands}). 
+Commands}).
 
 
 @node MH Spool
@@ -10189,7 +10359,7 @@ Virtual server settings:
 @table @code
 @item nnfolder-directory
 @vindex nnfolder-directory
-All the @code{nnfolder} mail boxes will be stored under this directory. 
+All the @code{nnfolder} mail boxes will be stored under this directory.
 
 @item nnfolder-active-file
 @vindex nnfolder-active-file
@@ -10352,6 +10522,9 @@ The rnews batch transport format.
 @item forward
 Forwarded articles.
 
+@item mime-parts
+MIME multipart messages, besides digests.
+
 @item mime-digest
 @cindex digest
 @cindex MIME digest
@@ -10364,7 +10537,7 @@ MIME (RFC 1341) digest format.
 The standard (RFC 1153) digest format.
 
 @item slack-digest
-Non-standard digest format---matches most things, but does it badly. 
+Non-standard digest format---matches most things, but does it badly.
 @end table
 
 You can also use the special ``file type'' @code{guess}, which means
@@ -10394,8 +10567,9 @@ Virtual server variables:
 @vindex nndoc-article-type
 This should be one of @code{mbox}, @code{babyl}, @code{digest},
 @code{news}, @code{rnews}, @code{mmdf}, @code{forward}, @code{rfc934},
-@code{rfc822-forward}, @code{mime-digest}, @code{standard-digest},
-@code{slack-digest}, @code{clari-briefs} or @code{guess}.
+@code{rfc822-forward}, @code{mime-parts}, @code{mime-digest},
+@code{standard-digest}, @code{slack-digest}, @code{clari-briefs} or
+@code{guess}.
 
 @item nndoc-post-type
 @vindex nndoc-post-type
@@ -10420,7 +10594,7 @@ and then hook into @code{nndoc}.
 First, here's an example document type definition:
 
 @example
-(mmdf 
+(mmdf
  (article-begin .  "^\^A\^A\^A\^A\n")
  (body-end .  "^\^A\^A\^A\^A\n"))
 @end example
@@ -10434,7 +10608,7 @@ types can be defined with very few settings:
 @item first-article
 If present, @code{nndoc} will skip past all text until it finds
 something that match this regexp.  All text before this will be
-totally ignored. 
+totally ignored.
 
 @item article-begin
 This setting has to be present in all document type definitions.  It
@@ -10446,7 +10620,7 @@ the article.
 
 @item nndoc-head-begin
 If present, this should be a regexp that matches the head of the
-article. 
+article.
 
 @item nndoc-head-end
 This should match the end of the head of the article.  It defaults to
@@ -10469,7 +10643,7 @@ If present, this should match the end of the body of the article.
 
 @item file-end
 If present, this should match the end of the file.  All text after this
-regexp will be totally ignored. 
+regexp will be totally ignored.
 
 @end table
 
@@ -10483,7 +10657,7 @@ something that's palatable for Gnus:
 @item prepare-body-function
 If present, this function will be called when requesting an article.  It
 will be called with point at the start of the body, and is useful if the
-document has encoded some parts of its contents. 
+document has encoded some parts of its contents.
 
 @item article-transform-function
 If present, this function is called when requesting an article.  It's
@@ -10543,11 +10717,11 @@ With built-in modem programs.  Yecchh!
 Of course, us Unix Weenie types of human beans use things like
 @code{uucp} and, like, @code{nntpd} and set up proper news and mail
 transport things like Ghod intended.  And then we just use normal
-newsreaders.  
+newsreaders.
 
 However, it can sometimes be convenient to do something a that's a bit
 easier on the brain if you have a very slow modem, and you're not really
-that interested in doing things properly.  
+that interested in doing things properly.
 
 A file format called @sc{soup} has been developed for transporting news
 and mail from servers to home machines and back again.  It can be a bit
@@ -10593,7 +10767,7 @@ use a dedicated @sc{soup} thingie (like the @code{awk} program), or you
 can use Gnus to create the packet with its @sc{soup} commands (@kbd{O
 s} and/or @kbd{G s b}; and then @kbd{G s p}) (@pxref{SOUP Commands}).
 
-@item 
+@item
 You transfer the packet home.  Rail, boat, car or modem will do fine.
 
 @item
@@ -10607,12 +10781,12 @@ the native or secondary server.
 You read articles and mail and answer and followup to the things you
 want (@pxref{SOUP Replies}).
 
-@item 
+@item
 You do the @kbd{G s r} command to pack these replies into a @sc{soup}
 packet.
 
-@item 
-You transfer this packet to the server.  
+@item
+You transfer this packet to the server.
 
 @item
 You use Gnus to mail this packet out with the @kbd{G s s} command.
@@ -10654,37 +10828,37 @@ Save all @sc{soup} data files (@code{gnus-soup-save-areas}).
 @kindex G s s (Group)
 @findex gnus-soup-send-replies
 Send all replies from the replies packet
-(@code{gnus-soup-send-replies}). 
+(@code{gnus-soup-send-replies}).
 
 @item G s p
 @kindex G s p (Group)
 @findex gnus-soup-pack-packet
-Pack all files into a @sc{soup} packet (@code{gnus-soup-pack-packet}). 
+Pack all files into a @sc{soup} packet (@code{gnus-soup-pack-packet}).
 
 @item G s r
 @kindex G s r (Group)
 @findex nnsoup-pack-replies
-Pack all replies into a replies packet (@code{nnsoup-pack-replies}). 
+Pack all replies into a replies packet (@code{nnsoup-pack-replies}).
 
 @item O s
 @kindex O s (Summary)
 @findex gnus-soup-add-article
 This summary-mode command adds the current article to a @sc{soup} packet
 (@code{gnus-soup-add-article}).  It understands the process/prefix
-convention (@pxref{Process/Prefix}). 
+convention (@pxref{Process/Prefix}).
 
 @end table
 
 
 There are a few variables to customize where Gnus will put all these
-thingies:  
+thingies:
 
 @table @code
 
 @item gnus-soup-directory
 @vindex gnus-soup-directory
 Directory where Gnus will save intermediate files while composing
-@sc{soup} packets.  The default is @file{~/SoupBrew/}. 
+@sc{soup} packets.  The default is @file{~/SoupBrew/}.
 
 @item gnus-soup-replies-directory
 @vindex gnus-soup-replies-directory
@@ -10694,12 +10868,12 @@ reply packets.  @file{~/SoupBrew/SoupReplies/} is the default.
 @item gnus-soup-prefix-file
 @vindex gnus-soup-prefix-file
 Name of the file where Gnus stores the last used prefix.  The default is
-@samp{gnus-prefix}. 
+@samp{gnus-prefix}.
 
 @item gnus-soup-packer
 @vindex gnus-soup-packer
 A format string command for packing a @sc{soup} packet.  The default is
-@samp{tar cf - %s | gzip > $HOME/Soupout%d.tgz}. 
+@samp{tar cf - %s | gzip > $HOME/Soupout%d.tgz}.
 
 @item gnus-soup-unpacker
 @vindex gnus-soup-unpacker
@@ -10708,15 +10882,15 @@ Format string command for unpacking a @sc{soup} packet.  The default is
 
 @item gnus-soup-packet-directory
 @vindex gnus-soup-packet-directory
-Where Gnus will look for reply packets.  The default is @file{~/}. 
+Where Gnus will look for reply packets.  The default is @file{~/}.
 
 @item gnus-soup-packet-regexp
 @vindex gnus-soup-packet-regexp
 Regular expression matching @sc{soup} reply packets in
-@code{gnus-soup-packet-directory}. 
+@code{gnus-soup-packet-directory}.
 
 @end table
- 
+
 
 @node SOUP Groups
 @subsubsection @sc{soup} Groups
@@ -10733,15 +10907,15 @@ These are the variables you can use to customize its behavior:
 @item nnsoup-tmp-directory
 @vindex nnsoup-tmp-directory
 When @code{nnsoup} unpacks a @sc{soup} packet, it does it in this
-directory.  (@file{/tmp/} by default.)  
+directory.  (@file{/tmp/} by default.)
 
 @item nnsoup-directory
 @vindex nnsoup-directory
 @code{nnsoup} then moves each message and index file to this directory.
 The default is @file{~/SOUP/}.
 
-@item nnsoup-replies-directory 
-@vindex nnsoup-replies-directory 
+@item nnsoup-replies-directory
+@vindex nnsoup-replies-directory
 All replies will be stored in this directory before being packed into a
 reply packet.  The default is @file{~/SOUP/replies/"}.
 
@@ -10766,17 +10940,17 @@ this file or mess it up in any way, you're dead.  The default is
 @item nnsoup-packer
 @vindex nnsoup-packer
 Format string command for packing a reply @sc{soup} packet.  The default
-is @samp{tar cf - %s | gzip > $HOME/Soupin%d.tgz}. 
+is @samp{tar cf - %s | gzip > $HOME/Soupin%d.tgz}.
 
 @item nnsoup-unpacker
 @vindex nnsoup-unpacker
 Format string command for unpacking incoming @sc{soup} packets.  The
-default is @samp{gunzip -c %s | tar xvf -}. 
+default is @samp{gunzip -c %s | tar xvf -}.
 
 @item nnsoup-packet-directory
 @vindex nnsoup-packet-directory
 Where @code{nnsoup} will look for incoming packets.  The default is
-@file{~/}.  
+@file{~/}.
 
 @item nnsoup-packet-regexp
 @vindex nnsoup-packet-regexp
@@ -10879,22 +11053,22 @@ Advisory maximum number of hits per search to display.  The default is
 @vindex nnweb-type-definition
 Type-to-definition alist.  This alist says what @code{nnweb} should do
 with the various search engine types.  The following elements must be
-present: 
+present:
 
 @table @code
 @item article
 Function to decode the article and provide something that Gnus
-understands. 
+understands.
 
 @item map
-Function to create an article number to message header and URL alist. 
+Function to create an article number to message header and URL alist.
 
 @item search
 Function to send the search string to the search engine.
 
 @item address
 The address the aforementioned function should send the search string
-to. 
+to.
 
 @item id
 Format string URL to fetch an article by @code{Message-ID}.
@@ -10919,14 +11093,14 @@ used to post with.
 Server variables:
 
 @table @code
-@item nngateway-address 
-@vindex nngateway-address 
+@item nngateway-address
+@vindex nngateway-address
 This is the address of the mail-to-news gateway.
 
 @item nngateway-header-transformation
 @vindex nngateway-header-transformation
 News headers often have to be transformed in some odd way or other
-for the mail-to-news gateway to accept it.  This variable says what 
+for the mail-to-news gateway to accept it.  This variable says what
 transformation should be called, and defaults to
 @code{nngateway-simple-header-transformation}.  The function is called
 narrowed to the headers to be transformed and with one parameter---the
@@ -10946,6 +11120,33 @@ will get this @code{From} header inserted:
 To: alt-religion-emacs@@GATEWAY
 @end example
 
+The following pre-defined functions exist:
+
+@findex nngateway-simple-header-transformation
+@table @code
+
+@item nngateway-simple-header-transformation
+Creates a @code{To} header that looks like
+@var{newsgroup}@@@code{nngateway-address}.
+
+@findex nngateway-mail2news-header-transformation
+
+@item nngateway-mail2news-header-transformation
+Creates a @code{To} header that looks like
+@code{nngateway-address}.
+
+Here's an example:
+
+@lisp
+(setq gnus-post-method
+      '(nngateway "mail2news@@replay.com"
+                  (nngateway-header-transformation
+                   nngateway-mail2news-header-transformation)))
+@end lisp
+
+@end table
+
+
 @end table
 
 So, to use this, simply say something like:
@@ -10971,6 +11172,7 @@ groups.
 @subsection Virtual Groups
 @cindex nnvirtual
 @cindex virtual groups
+@cindex merging groups
 
 An @dfn{nnvirtual group} is really nothing more than a collection of
 other groups.
@@ -11004,7 +11206,7 @@ If you would like to read @samp{soc.motss} both from a server in Japan
 and a server in Norway, you could use the following as the group regexp:
 
 @example
-"^nntp\\+some\\.server\\.jp:soc\\.motss$\\|^nntp\\+some\\.server\\.no:soc\\.motss$"
+"^nntp\\+server\\.jp:soc\\.motss$\\|^nntp\\+server\\.no:soc\\.motss$"
 @end example
 
 (Remember, though, that if you're creating the group with @kbd{G m}, you
@@ -11046,7 +11248,7 @@ with useless requests!  Oh happiness!
 
 @kindex G k (Group)
 To create a kibozed group, use the @kbd{G k} command in the group
-buffer. 
+buffer.
 
 The address field of the @code{nnkiboze} method is, as with
 @code{nnvirtual}, a regexp to match groups to be ``included'' in the
@@ -11135,6 +11337,7 @@ Of course, to use it as such, you have to learn a few new commands.
 * Agent Basics::           How it all is supposed to work.
 * Agent Categories::       How to tell the Gnus Agent what to download.
 * Agent Commands::         New commands for all the buffers.
+* Agent Expiry::           How to make old articles go away.
 * Outgoing Messages::      What happens when you post/mail something?
 * Agent Variables::        Customizing is fun.
 * Example Setup::          An example @file{.gnus.el} file for offline people.
@@ -11153,7 +11356,7 @@ When the connection to the net is up again (and Gnus knows this), the
 Agent is @dfn{plugged}.
 
 The @dfn{local} machine is the one you're running on, and which isn't
-connected to the net continously.
+connected to the net continuously.
 
 @dfn{Downloading} means fetching things from the net to your local
 machine.  @dfn{Uploading} is doing the opposite.
@@ -11220,7 +11423,7 @@ mark the articles for downloading manually if it should turn out that
 you're interested in the articles anyway.
 
 The main way to control what is to be downloaded is to create a
-@dfn{category} and then assign some (or all) groups to this category. 
+@dfn{category} and then assign some (or all) groups to this category.
 Gnus has its own buffer for creating and managing categories.
 
 @menu
@@ -11389,7 +11592,7 @@ Hook run in category buffers.
 @item gnus-category-line-format
 @vindex gnus-category-line-format
 Format of the lines in the category buffer (@pxref{Formatting
-Variables}).  Legal elements are:
+Variables}).  Valid elements are:
 
 @table @samp
 @item c
@@ -11401,25 +11604,25 @@ The number of groups in the category.
 
 @item gnus-category-mode-line-format
 @vindex gnus-category-mode-line-format
-Format of the category mode line.
+Format of the category mode line (@pxref{Mode Line Formatting}).
 
-@item gnus-agent-short-article 
-@vindex gnus-agent-short-article 
+@item gnus-agent-short-article
+@vindex gnus-agent-short-article
 Articles that have fewer lines than this are short.  Default 100.
 
-@item gnus-agent-long-article 
-@vindex gnus-agent-long-article 
+@item gnus-agent-long-article
+@vindex gnus-agent-long-article
 Articles that have more lines than this are long.  Default 200.
 
-@item gnus-agent-low-score 
-@vindex gnus-agent-low-score 
+@item gnus-agent-low-score
+@vindex gnus-agent-low-score
 Articles that have a score lower than this have a low score.  Default
-0. 
+0.
 
-@item gnus-agent-high-score 
-@vindex gnus-agent-high-score 
+@item gnus-agent-high-score
+@vindex gnus-agent-high-score
 Articles that have a score higher than this have a high score.  Default
-0. 
+0.
 
 @end table
 
@@ -11452,7 +11655,7 @@ $ emacs -batch -l ~/.gnus.el -f gnus-agent-batch-fetch
 @subsubsection Group Agent Commands
 
 @table @kbd
-@item J u 
+@item J u
 @kindex J u (Agent Group)
 @findex gnus-agent-fetch-groups
 Fetch all eligible articles in the current group
@@ -11499,7 +11702,7 @@ Mark the article for downloading (@code{gnus-agent-mark-article}).
 Remove the downloading mark from the article
 (@code{gnus-agent-unmark-article}).
 
-@item @@
+@item @@ 
 @kindex @@ (Agent Summary)
 @findex gnus-agent-toggle-mark
 Toggle whether to download the article (@code{gnus-agent-toggle-mark}).
@@ -11531,6 +11734,30 @@ Agent (@code{gnus-agent-remove-server}).
 @end table
 
 
+@node Agent Expiry
+@subsection Agent Expiry
+
+@vindex gnus-agent-expiry-days
+@findex gnus-agent-expiry
+@kindex M-x gnus-agent-expiry
+@cindex Agent expiry
+@cindex Gnus Agent expiry
+@cindex expiry
+
+@code{nnagent} doesn't handle expiry.  Instead, there's a special
+@code{gnus-agent-expiry} command that will expire all read articles that
+are older than @code{gnus-agent-expiry-days} days.  It can be run
+whenever you feel that you're running out of space.  It's not
+particularly fast or efficient, and it's not a particularly good idea to
+interrupt it (with @kbd{C-g} or anything else) once you've started it.
+
+@vindex gnus-agent-expire-all
+if @code{gnus-agent-expire-all} is non-@code{nil}, this command will
+expire all articles---unread, read, ticked and dormant.  If @code{nil}
+(which is the default), only read articles are eligible for expiry, and
+unread, ticked and dormant articles will be kept indefinitely.
+
+
 @node Outgoing Messages
 @subsection Outgoing Messages
 
@@ -11659,7 +11886,7 @@ Temporary score entries are self-expiring entries.  Any entries that are
 temporary and have not been used for, say, a week, will be removed
 silently to help keep the sizes of the score files down.
 
-@menu 
+@menu
 * Summary Score Commands::   Adding score entries for the current group.
 * Group Score Commands::     General score commands.
 * Score Variables::          Customize your scoring.  (My, what terminology).
@@ -11701,19 +11928,19 @@ General score commands that don't actually change the score file:
 @item V s
 @kindex V s (Summary)
 @findex gnus-summary-set-score
-Set the score of the current article (@code{gnus-summary-set-score}).  
+Set the score of the current article (@code{gnus-summary-set-score}).
 
 @item V S
 @kindex V S (Summary)
 @findex gnus-summary-current-score
 Display the score of the current article
-(@code{gnus-summary-current-score}).   
+(@code{gnus-summary-current-score}).
 
 @item V t
 @kindex V t (Summary)
 @findex gnus-score-find-trace
 Display all score rules that have been used on the current article
-(@code{gnus-score-find-trace}).   
+(@code{gnus-score-find-trace}).
 
 @item V R
 @kindex V R (Summary)
@@ -11723,17 +11950,11 @@ Run the current summary through the scoring process
 around with your score files behind Gnus' back and want to see the
 effect you're having.
 
-@item V a
-@kindex V a (Summary)
-@findex gnus-summary-score-entry
-Add a new score entry, and allow specifying all elements 
-(@code{gnus-summary-score-entry}).
-
 @item V c
 @kindex V c (Summary)
 @findex gnus-score-change-score-file
 Make a different score file the current
-(@code{gnus-score-change-score-file}). 
+(@code{gnus-score-change-score-file}).
 
 @item V e
 @kindex V e (Summary)
@@ -11758,7 +11979,7 @@ after editing score files.
 @kindex V C (Summary)
 @findex gnus-score-customize
 Customize a score file in a visually pleasing manner
-(@code{gnus-score-customize}). 
+(@code{gnus-score-customize}).
 
 @end table
 
@@ -11782,7 +12003,7 @@ expunge all articles below this score
 
 The keystrokes for actually making score entries follow a very regular
 pattern, so there's no need to list all the commands.  (Hundreds of
-them.)  
+them.)
 
 @findex gnus-summary-increase-score
 @findex gnus-summary-lower-score
@@ -11790,7 +12011,7 @@ them.)
 @enumerate
 @item
 The first key is either @kbd{I} (upper case i) for increasing the score
-or @kbd{L} for lowering the score. 
+or @kbd{L} for lowering the score.
 @item
 The second key says what header you want to score on.  The following
 keys are available:
@@ -11833,7 +12054,7 @@ what headers you are scoring on.
 
 @table @code
 
-@item strings 
+@item strings
 
 @table @kbd
 
@@ -11857,7 +12078,7 @@ Regexp matching
 Before date.
 
 @item a
-At date.
+After date.
 
 @item n
 This date.
@@ -11877,7 +12098,7 @@ Greater than number.
 @end table
 @end table
 
-@item 
+@item
 The fourth and final key says whether this is a temporary (i.e., expiring)
 score entry, or a permanent (i.e., non-expiring) score entry, or whether
 it is to be done immediately, without adding to the score file.
@@ -11930,7 +12151,7 @@ There aren't many of these as yet, I'm afraid.
 @findex gnus-score-flush-cache
 Gnus maintains a cache of score alists to avoid having to reload them
 all the time.  This command will flush the cache
-(@code{gnus-score-flush-cache}). 
+(@code{gnus-score-flush-cache}).
 
 @end table
 
@@ -12023,7 +12244,7 @@ default.  Default is @samp{-}.
 @item gnus-score-find-score-files-function
 @vindex gnus-score-find-score-files-function
 Function used to find score files for the current group.  This function
-is called with the name of the group as the argument. 
+is called with the name of the group as the argument.
 
 Predefined functions available are:
 @table @code
@@ -12035,14 +12256,14 @@ Only apply the group's own score file.
 @item gnus-score-find-bnews
 @findex gnus-score-find-bnews
 Apply all score files that match, using bnews syntax.  This is the
-default.  If the current group is @samp{gnu.emacs.gnus}, for instance, 
+default.  If the current group is @samp{gnu.emacs.gnus}, for instance,
 @file{all.emacs.all.SCORE}, @file{not.alt.all.SCORE} and
 @file{gnu.all.SCORE} would all apply.  In short, the instances of
 @samp{all} in the score file names are translated into @samp{.*}, and
 then a regexp match is done.
 
 This means that if you have some score entries that you want to apply to
-all groups, then you put those entries in the @file{all.SCORE} file. 
+all groups, then you put those entries in the @file{all.SCORE} file.
 
 The score files are applied in a semi-random order, although Gnus will
 try to apply the more general score files before the more specific score
@@ -12077,7 +12298,7 @@ their dates updated.  (This is how Gnus controls expiry---all
 non-matching entries will become too old while matching entries will
 stay fresh and young.)  However, if you set this variable to @code{nil},
 even matching entries will grow old and will have to face that oh-so
-grim reaper.  
+grim reaper.
 
 @item gnus-score-after-write-file-function
 @vindex gnus-score-after-write-file-function
@@ -12159,12 +12380,12 @@ Following this key is a arbitrary number of score entries, where each
 score entry has one to four elements.
 @enumerate
 
-@item 
+@item
 The first element is the @dfn{match element}.  On most headers this will
 be a string, but on the Lines and Chars headers, this must be an
-integer. 
+integer.
 
-@item 
+@item
 If the second element is present, it should be a number---the @dfn{score
 element}.  This number should be an integer in the neginf to posinf
 interval.  This number is added to the score of the article if the match
@@ -12172,14 +12393,14 @@ is successful.  If this element is not present, the
 @code{gnus-score-interactive-default-score} number will be used
 instead.  This is 1000 by default.
 
-@item 
+@item
 If the third element is present, it should be a number---the @dfn{date
 element}.  This date says when the last time this score entry matched,
 which provides a mechanism for expiring the score entries.  It this
 element is not present, the score entry is permanent.  The date is
 represented by the number of days since December 31, 1 BCE.
 
-@item 
+@item
 If the fourth element is present, it should be a symbol---the @dfn{type
 element}.  This element specifies what function should be used to see
 whether this score entry matches the article.  What match types that can
@@ -12199,11 +12420,31 @@ instead, if you feel like.
 
 @item Lines, Chars
 These two headers use different match types: @code{<}, @code{>},
-@code{=}, @code{>=} and @code{<=}.  When matching on @code{Lines}, be
-careful because some backends (like @code{nndir}) do not generate
-@code{Lines} header, so every article ends up being marked as having 0
-lines.  This can lead to strange results if you happen to lower score of
-the articles with few lines.
+@code{=}, @code{>=} and @code{<=}.
+
+These predicates are true if
+
+@example
+(PREDICATE HEADER MATCH)
+@end example
+
+evaluates to non-@code{nil}.  For instance, the advanced match
+@code{("lines" 4 <)} (@pxref{Advanced Scoring}) will result in the
+following form:
+
+@lisp
+(< header-value 4)
+@end lisp
+
+Or to put it another way: When using @code{<} on @code{Lines} with 4 as
+the match, we get the score added if the article has less than 4 lines.
+(It's easy to get confused and think it's the other way around.  But
+it's not.  I think.)
+
+When matching on @code{Lines}, be careful because some backends (like
+@code{nndir}) do not generate @code{Lines} header, so every article ends
+up being marked as having 0 lines.  This can lead to strange results if
+you happen to lower score of the articles with few lines.
 
 @item Date
 For the Date header we have three kinda silly match types:
@@ -12238,7 +12479,7 @@ you e.g. increase the score of followups to your own articles, or
 decrease the score of followups to the articles of some known
 trouble-maker.  Uses the same match types as the @code{From} header
 uses.  (Using this match key will lead to creation of @file{ADAPT}
-files.) 
+files.)
 
 @item Thread
 This match key works along the same lines as the @code{Followup} match
@@ -12282,15 +12523,17 @@ this one was.
 @item exclude-files
 The clue of this entry should be any number of files.  These files will
 not be loaded, even though they would normally be so, for some reason or
-other. 
+other.
 
 @item eval
 The value of this entry will be @code{eval}el.  This element will be
-ignored when handling global score files. 
+ignored when handling global score files.
 
 @item read-only
 Read-only score files will not be updated or saved.  Global score files
-should feature this atom (@pxref{Global Score Files}).
+should feature this atom (@pxref{Global Score Files}).  (Note:
+@dfn{Global} here really means @dfn{global}; not your personal
+apply-to-all-groups score files.)
 
 @item orphan
 The value of this entry should be a number.  Articles that do not have
@@ -12327,7 +12570,7 @@ scoring on most groups, you'd set @code{gnus-use-adaptive-scoring} to
 not want adaptive scoring.  If you only want adaptive scoring in a few
 groups, you'd set @code{gnus-use-adaptive-scoring} to @code{nil}, and
 insert @code{(adapt t)} in the score files of the groups where you want
-it. 
+it.
 
 @item adapt-file
 All adaptive score entries will go to the file named by this entry.  It
@@ -12350,7 +12593,7 @@ much.  Note that the @var{value} won't be evaluated.
 
 You normally enter all scoring commands from the summary buffer, but you
 might feel the urge to edit them by hand as well, so we've supplied you
-with a mode for that.  
+with a mode for that.
 
 It's simply a slightly customized @code{emacs-lisp} mode, with these
 additional commands:
@@ -12361,7 +12604,7 @@ additional commands:
 @kindex C-c C-c (Score)
 @findex gnus-score-edit-done
 Save the changes you have made and return to the summary buffer
-(@code{gnus-score-edit-done}). 
+(@code{gnus-score-edit-done}).
 
 @item C-c C-d
 @kindex C-c C-d (Score)
@@ -12376,7 +12619,7 @@ you were wondering.
 The adaptive score files are saved in an unformatted fashion.  If you
 intend to read one of these files, you want to @dfn{pretty print} it
 first.  This command (@code{gnus-score-pretty-print}) does that for
-you. 
+you.
 
 @end table
 
@@ -12441,7 +12684,7 @@ will be applied to each article.
 To take @code{gnus-del-mark} as an example---this alist says that all
 articles that have that mark (i.e., are marked with @samp{D}) will have a
 score entry added to lower based on the @code{From} header by -4, and
-lowered by @code{Subject} by -1.  Change this to fit your prejudices. 
+lowered by @code{Subject} by -1.  Change this to fit your prejudices.
 
 If you have marked 10 articles with the same subject with
 @code{gnus-del-mark}, the rule for that mark will be applied ten times.
@@ -12458,7 +12701,7 @@ The headers you can score on are @code{from}, @code{subject},
 @code{chars} and @code{date}.  In addition, you can score on
 @code{followup}, which will create an adaptive score entry that matches
 on the @code{References} header using the @code{Message-ID} of the
-current article, thereby matching the following thread.  
+current article, thereby matching the following thread.
 
 You can also score on @code{thread}, which will try to score all
 articles that appear in a thread.  @code{thread} matches uses a
@@ -12473,7 +12716,7 @@ changes result in articles getting marked as read.
 
 After using adaptive scoring for a week or so, Gnus should start to
 become properly trained and enhance the authors you like best, and kill
-the authors you like least, without you having to say so explicitly. 
+the authors you like least, without you having to say so explicitly.
 
 You can control what groups the adaptive scoring is to be performed on
 by using the score files (@pxref{Score File Format}).  This will also
@@ -12500,7 +12743,7 @@ headers.  If you adapt on words, the
 each instance of a word should add given a mark.
 
 @lisp
-(setq gnus-default-adaptive-word-score-alist  
+(setq gnus-default-adaptive-word-score-alist
       `((,gnus-read-mark . 30)
         (,gnus-catchup-mark . -10)
         (,gnus-killed-mark . -20)
@@ -12535,7 +12778,7 @@ what words you like and what words you don't like.  Or perhaps not.
 Note that the adaptive word scoring thing is highly experimental and is
 likely to change in the future.  Initial impressions seem to indicate
 that it's totally useless as it stands.  Some more work (involving more
-rigorous statistical methods) will have to be done to make this useful. 
+rigorous statistical methods) will have to be done to make this useful.
 
 
 @node Home Score File
@@ -12557,26 +12800,26 @@ be:
 @enumerate
 @item
 A string.  Then this file will be used as the home score file for all
-groups. 
+groups.
 
 @item
 A function. The result of this function will be used as the home score
 file.  The function will be called with the name of the group as the
-parameter. 
+parameter.
 
 @item
 A list.  The elements in this list can be:
 
 @enumerate
-@item 
+@item
 @var{(regexp file-name)}.  If the @var{regexp} matches the group name,
 the @var{file-name} will will be used as the home score file.
 
-@item 
+@item
 A function. If the function returns non-nil, the result will be used as
 the home score file.
 
-@item 
+@item
 A string.  Use the string as the home score file.
 @end enumerate
 
@@ -12595,12 +12838,22 @@ So, if you want to use just a single score file, you could say:
 If you want to use @file{gnu.SCORE} for all @samp{gnu} groups and
 @file{rec.SCORE} for all @samp{rec} groups (and so on), you can say:
 
+@findex gnus-hierarchial-home-score-file
 @lisp
 (setq gnus-home-score-file
       'gnus-hierarchial-home-score-file)
 @end lisp
 
 This is a ready-made function provided for your convenience.
+Other functions include
+
+@table @code
+@item gnus-current-home-score-file
+@findex gnus-current-home-score-file
+Return the ``current'' regular score file.  This will make scoring
+commands add entry to the ``innermost'' matching score file.
+
+@end table
 
 If you want to have one score file for the @samp{emacs} groups and
 another for the @samp{comp} groups, while letting all other groups use
@@ -12609,11 +12862,11 @@ their own home score files:
 @lisp
 (setq gnus-home-score-file
       ;; All groups that match the regexp "\\.emacs"
-      '("\\.emacs" "emacs.SCORE")
-      ;; All the comp groups in one score file
-       ("^comp" "comp.SCORE"))
+      '(("\\.emacs" "emacs.SCORE")
+        ;; All the comp groups in one score file
+        ("^comp" "comp.SCORE")))
 @end lisp
-   
+
 @vindex gnus-home-adapt-file
 @code{gnus-home-adapt-file} works exactly the same way as
 @code{gnus-home-score-file}, but says what the home adaptive score file
@@ -12642,7 +12895,7 @@ to easily note when people answer what you've said.
 @item gnus-score-followup-article
 @findex gnus-score-followup-article
 This will add a score to articles that directly follow up your own
-article. 
+article.
 
 @item gnus-score-followup-thread
 @findex gnus-score-followup-thread
@@ -12652,11 +12905,11 @@ your own article.
 
 @vindex message-sent-hook
 These two functions are both primarily meant to be used in hooks like
-@code{message-sent-hook}.  
+@code{message-sent-hook}.
 
 If you look closely at your own @code{Message-ID}, you'll notice that
 the first two or three characters are always the same.  Here's two of
-mine:  
+mine:
 
 @example
 <x6u3u47icf.fsf@@eyesore.no>
@@ -12665,7 +12918,7 @@ mine:
 
 So ``my'' ident on this machine is @samp{x6}.  This can be
 exploited---the following rule will raise the score on all followups to
-myself: 
+myself:
 
 @lisp
 ("references"
@@ -12707,7 +12960,7 @@ keys (@code{Head}, @code{Body} and @code{All}), you should choose one
 and stick with it in each score file.  If you use any two, each article
 will be fetched @emph{twice}.  If you want to match a bit on the
 @code{Head} and a bit on the @code{Body}, just use @code{All} for all
-the matches.  
+the matches.
 
 @item Marking as read
 You will probably want to mark articles that has a score below a certain
@@ -12716,7 +12969,7 @@ in your @file{all.SCORE} file:
 @lisp
 ((mark -100))
 @end lisp
-You may also consider doing something similar with @code{expunge}.  
+You may also consider doing something similar with @code{expunge}.
 
 @item Negated character classes
 If you say stuff like @code{[^abcd]*}, you may get unexpected results.
@@ -12789,16 +13042,16 @@ sympathy of the people, luring them to use their score files on false
 premises!  Yay!  The net is saved!
 
 Here are some tips for the would-be retro-moderator, off the top of my
-head: 
+head:
 
 @itemize @bullet
 
-@item 
-Articles heavily crossposted are probably junk. 
+@item
+Articles heavily crossposted are probably junk.
 @item
 To lower a single inappropriate article, lower by @code{Message-ID}.
 @item
-Particularly brilliant authors can be raised on a permanent basis. 
+Particularly brilliant authors can be raised on a permanent basis.
 @item
 Authors that repeatedly post off-charter for the group can safely be
 lowered out of existence.
@@ -12806,7 +13059,7 @@ lowered out of existence.
 Set the @code{mark} and @code{expunge} atoms to obliterate the nastiest
 articles completely.
 
-@item 
+@item
 Use expiring score entries to keep the size of the file down.  You
 should probably have a long expiry period, though, as some sites keep
 old articles for a long time.
@@ -12848,7 +13101,7 @@ marked articles from the summary buffer.  Very useful, you'll agree.
 
 Other programs use a totally different kill file syntax.  If Gnus
 encounters what looks like a @code{rn} kill file, it will take a stab at
-interpreting it. 
+interpreting it.
 
 Two summary functions for editing a GNUS kill file:
 
@@ -12895,7 +13148,7 @@ course) is just called @file{KILL}.
 @item gnus-kill-save-kill-file
 If this variable is non-@code{nil}, Gnus will save the
 kill file after processing, which is necessary if you use expiring
-kills. 
+kills.
 
 @item gnus-apply-kill-hook
 @vindex gnus-apply-kill-hook
@@ -12926,12 +13179,12 @@ by hand.
 
 The kill to score conversion package isn't included in Gnus by default.
 You can fetch it from
-@file{http://www.ifi.uio.no/~larsi/ding-other/gnus-kill-to-score}.  
+@file{http://www.stud.ifi.uio.no/~larsi/ding-other/gnus-kill-to-score}.
 
 If your old kill files are very complex---if they contain more
 non-@code{gnus-kill} forms than not, you'll have to convert them by
 hand.  Or just let them be as they are.  Gnus will still use them as
-before. 
+before.
 
 
 @node GroupLens
@@ -12984,7 +13237,7 @@ with the Better Bit Bureau.
 
 @item grouplens-newsgroups
 @vindex grouplens-newsgroups
-A list of groups that you want to get GroupLens predictions for. 
+A list of groups that you want to get GroupLens predictions for.
 
 @end table
 
@@ -13077,7 +13330,7 @@ The following are valid values for that variable.
 @table @code
 @item prediction-spot
 The higher the prediction, the further to the right an @samp{*} is
-displayed. 
+displayed.
 
 @item confidence-interval
 A numeric confidence interval.
@@ -13123,7 +13376,7 @@ Offset the prediction by this value.  In other words, subtract the
 prediction value by this number to arrive at the effective score.  The
 default is 0.
 
-@item grouplens-score-scale-factor 
+@item grouplens-score-scale-factor
 This variable allows the user to magnify the effect of GroupLens scores.
 The scale factor is applied after the offset.  The default is 1.
 
@@ -13168,7 +13421,7 @@ Logical operators:
 This logical operator will evaluate each of its arguments until it finds
 one that evaluates to @code{false}, and then it'll stop.  If all arguments
 evaluate to @code{true} values, then this operator will return
-@code{true}. 
+@code{true}.
 
 @item |
 @itemx or
@@ -13206,7 +13459,7 @@ Let's say you want to increase the score of articles written by Lars
 when he's talking about Gnus:
 
 @example
-((& 
+((&
   ("from" "Lars Ingebrigtsen")
   ("subject" "Gnus"))
  1000)
@@ -13214,10 +13467,10 @@ when he's talking about Gnus:
 
 Quite simple, huh?
 
-When he writes long articles, he sometimes has something nice to say: 
+When he writes long articles, he sometimes has something nice to say:
 
 @example
-((& 
+((&
   ("from" "Lars Ingebrigtsen")
   (|
    ("subject" "Gnus")
@@ -13282,7 +13535,7 @@ current article".  An indirection is quite fast, but it's better to say:
 
 @example
 (1-
- (& 
+ (&
   ("from" "Lars")
   ("subject" "Gnus")))
 @end example
@@ -13308,18 +13561,20 @@ use them in any sensible way.
 
 @vindex gnus-decay-scores
 @findex gnus-decay-score
-@vindex gnus-score-decay-function
+@vindex gnus-decay-score-function
 Gnus provides a mechanism for decaying scores to help with this problem.
 When score files are loaded and @code{gnus-decay-scores} is
 non-@code{nil}, Gnus will run the score files through the decaying
 mechanism thereby lowering the scores of all non-permanent score rules.
-The decay itself if performed by the @code{gnus-score-decay-function}
+The decay itself if performed by the @code{gnus-decay-score-function}
 function, which is @code{gnus-decay-score} by default.  Here's the
 definition of that function:
 
 @lisp
 (defun gnus-decay-score (score)
-  "Decay SCORE according to `gnus-score-decay-constant' and `gnus-score-decay-scale'."
+  "Decay SCORE.
+This is done according to `gnus-score-decay-constant'
+and `gnus-score-decay-scale'."
   (floor
    (- score
       (* (if (< score 0) 1 -1)
@@ -13374,7 +13629,7 @@ four days, Gnus will decay the scores four times, for instance.
 * Moderation::                 What to do if you're a moderator.
 * XEmacs Enhancements::        There are more pictures and stuff under XEmacs.
 * Fuzzy Matching::             What's the big fuzz?
-* Thwarting Email Spam::       A how-to on avoiding unsolited commercial email.
+* Thwarting Email Spam::       A how-to on avoiding unsolicited commercial email.
 * Various Various::            Things that are really various.
 @end menu
 
@@ -13453,7 +13708,7 @@ is @code{t} by default.
 @item gnus-interactive-exit
 @vindex gnus-interactive-exit
 Require confirmation before exiting Gnus.  This variable is @code{t} by
-default. 
+default.
 @end table
 
 
@@ -13462,7 +13717,7 @@ default.
 @cindex symbolic prefixes
 
 Quite a lot of Emacs commands react to the (numeric) prefix.  For
-instance, @kbd{C-u 4 C-f} moves point four charaters forward, and
+instance, @kbd{C-u 4 C-f} moves point four characters forward, and
 @kbd{C-u 9 0 0 I s s p} adds a permanent @code{Subject} substring score
 rule of 900 to the current article.
 
@@ -13496,7 +13751,8 @@ Interactive}.
 @section Formatting Variables
 @cindex formatting variables
 
-Throughout this manual you've probably noticed lots of variables called things like @code{gnus-group-line-format} and
+Throughout this manual you've probably noticed lots of variables called
+things like @code{gnus-group-line-format} and
 @code{gnus-summary-mode-line-format}.  These control how Gnus is to
 output lines in the various buffers.  There's quite a lot of them.
 Fortunately, they all use the same syntax, so there's not that much to
@@ -13504,10 +13760,11 @@ be annoyed by.
 
 Here's an example format spec (from the group buffer): @samp{%M%S%5y:
 %(%g%)\n}.  We see that it is indeed extremely ugly, and that there are
-lots of percentages everywhere.  
+lots of percentages everywhere.
 
-@menu 
+@menu
 * Formatting Basics::     A formatting variable is basically a format string.
+* Mode Line Formatting::  Some rules about mode line formatting variables.
 * Advanced Formatting::   Modifying output in various ways.
 * User-Defined Specs::    Having Gnus call your own functions.
 * Formatting Fonts::      Making the formatting look colorful and nice.
@@ -13530,7 +13787,7 @@ case, they will be @code{eval}ed to insert the required lines.
 Gnus includes a command to help you while creating your own format
 specs.  @kbd{M-x gnus-update-format} will @code{eval} the current form,
 update the spec in question and pop you to a buffer where you can
-examine the resulting lisp code to be run to generate the line.  
+examine the resulting lisp code to be run to generate the line.
 
 
 
@@ -13554,6 +13811,31 @@ means that the field will never be more than 6 characters wide and never
 less than 4 characters wide.
 
 
+@node Mode Line Formatting
+@subsection Mode Line Formatting
+
+Mode line formatting variables (e.g.,
+@code{gnus-summary-mode-line-format}) follow the same rules as other,
+buffer line oriented formatting variables (@pxref{Formatting Basics})
+with the following two differences:
+
+@enumerate
+
+@item
+There must be no newline (@samp{\n}) at the end.
+
+@item
+The special @samp{%%b} spec can be used to display the buffer name.
+Well, it's no spec at all, really---@samp{%%} is just a way to quote
+@samp{%} to allow it to pass through the formatting machinery unmangled,
+so that Emacs receives @samp{%b}, which is something the Emacs mode line
+display interprets to mean ``show the buffer name''.  For a full list of
+mode line specs Emacs understands, see the documentation of the
+@code{mode-line-format} variable.
+
+@end enumerate
+
+
 @node Advanced Formatting
 @subsection Advanced Formatting
 
@@ -13580,7 +13862,7 @@ Cut off characters from the left until it reaches the specified length.
 
 @item max-right
 Cut off characters from the right until it reaches the specified
-length. 
+length.
 
 @item cut
 @itemx cut-left
@@ -13590,11 +13872,11 @@ Cut off the specified number of characters from the left.
 Cut off the specified number of characters from the right.
 
 @item ignore
-Return an empty string if the field is equal to the specified value. 
+Return an empty string if the field is equal to the specified value.
 
 @item form
 Use the specified form as the field value when the @samp{@@} spec is
-used. 
+used.
 @end table
 
 Let's take an example.  The @samp{%o} spec in the summary mode lines
@@ -13606,12 +13888,12 @@ maxing, and we need the padding to ensure that the date is never less
 than 6 characters to make it look nice in columns.)
 
 Ignoring is done first; then cutting; then maxing; and then as the very
-last operation, padding.  
+last operation, padding.
 
 If you use lots of these advanced thingies, you'll find that Gnus gets
 quite slow.  This can be helped enormously by running @kbd{M-x
 gnus-compile} when you are satisfied with the look of your lines.
-@xref{Compilation}. 
+@xref{Compilation}.
 
 
 @node User-Defined Specs
@@ -13643,9 +13925,9 @@ the special @code{mouse-face} property set, which means that it will be
 highlighted (with @code{gnus-mouse-face}) when you put the mouse pointer
 over it.
 
-Text inside the @samp{%[} and @samp{%]} specifiers will have their
+Text inside the @samp{%@{} and @samp{%@}} specifiers will have their
 normal faces set using @code{gnus-face-0}, which is @code{bold} by
-default.  If you say @samp{%1[}, you'll get @code{gnus-face-1} instead,
+default.  If you say @samp{%1@{}, you'll get @code{gnus-face-1} instead,
 and so on.  Create as many faces as you wish.  The same goes for the
 @code{mouse-face} specs---you can say @samp{%3(hello%)} to have
 @samp{hello} mouse-highlighted with @code{gnus-mouse-face-3}.
@@ -13657,8 +13939,8 @@ Here's an alternative recipe for the group buffer:
 (setq gnus-face-1 'bold)
 (setq gnus-face-3 'italic)
 
-;; We want the article count to be in 
-;; a bold and green face.  So we create 
+;; We want the article count to be in
+;; a bold and green face.  So we create
 ;; a new face called `my-green-bold'.
 (copy-face 'bold 'my-green-bold)
 ;; Set the color.
@@ -13666,7 +13948,7 @@ Here's an alternative recipe for the group buffer:
 (setq gnus-face-2 'my-green-bold)
 
 ;; Set the new & fancy format.
-(setq gnus-group-line-format 
+(setq gnus-group-line-format
       "%M%S%3@{%5y%@}%2[:%] %(%1@{%g%@}%)\n")
 @end lisp
 
@@ -13695,7 +13977,7 @@ buffer should be given.  Here's an excerpt of this variable:
 @lisp
 ((group (vertical 1.0 (group 1.0 point)
                       (if gnus-carpal (group-carpal 4))))
- (article (vertical 1.0 (summary 0.25 point) 
+ (article (vertical 1.0 (summary 0.25 point)
                         (article 1.0))))
 @end lisp
 
@@ -13722,7 +14004,10 @@ whatever they need.  There should be only one buffer with the @code{1.0}
 size spec per split.
 
 Point will be put in the buffer that has the optional third element
-@code{point}. 
+@code{point}.  In a @code{frame} split, the last subsplit having a leaf
+split where the tag @code{frame-focus} is a member (i.e. is the third or
+fourth element in the list, depending on whether the @code{point} tag is
+present) gets focus.
 
 Here's a more complicated example:
 
@@ -13733,7 +14018,7 @@ Here's a more complicated example:
                        (article 1.0)))
 @end lisp
 
-If the size spec is an integer instead of a floating point number, 
+If the size spec is an integer instead of a floating point number,
 then that number will be used to say how many lines a buffer should
 occupy, not a percentage.
 
@@ -13747,7 +14032,7 @@ is non-@code{nil}.
 Not complicated enough for you?  Well, try this on for size:
 
 @lisp
-(article (horizontal 1.0 
+(article (horizontal 1.0
              (vertical 0.5
                  (group 1.0)
                  (gnus-carpal 4))
@@ -13758,7 +14043,7 @@ Not complicated enough for you?  Well, try this on for size:
 @end lisp
 
 Whoops.  Two buffers with the mystery 100% tag.  And what's that
-@code{horizontal} thingie?  
+@code{horizontal} thingie?
 
 If the first element in one of the split is @code{horizontal}, Gnus will
 split the window horizontally, giving you two windows side-by-side.
@@ -13778,7 +14063,7 @@ split       = frame | horizontal | vertical | buffer | form
 frame       = "(frame " size *split ")"
 horizontal  = "(horizontal " size *split ")"
 vertical    = "(vertical " size *split ")"
-buffer      = "(" buffer-name " " size *[ "point" ] ")"
+buffer      = "(" buffer-name " " size *[ "point" ] *[ "frame-focus"] ")"
 size        = number | frame-params
 buffer-name = group | article | summary ...
 @end example
@@ -13786,7 +14071,7 @@ buffer-name = group | article | summary ...
 The limitations are that the @code{frame} split can only appear as the
 top-level split.  @var{form} should be an Emacs Lisp form that should
 return a valid split.  We see that each split is fully recursive, and
-may contain any number of @code{vertical} and @code{horizontal} splits. 
+may contain any number of @code{vertical} and @code{horizontal} splits.
 
 @vindex gnus-window-min-width
 @vindex gnus-window-min-height
@@ -13814,7 +14099,7 @@ three for the article buffer.  (I said it was nonsensical.)  If you
 look straight away, without going through the normal Gnus channels.
 Play with it until you're satisfied, and then use
 @code{gnus-add-configuration} to add your new creation to the buffer
-configuration list. 
+configuration list.
 
 @lisp
 (gnus-configure-frame
@@ -13836,7 +14121,7 @@ You might want to have several frames as well.  No prob---just use the
 (gnus-configure-frame
  '(frame 1.0
          (vertical 1.0
-                   (summary 0.25 point)
+                   (summary 0.25 point frame-focus)
                    (article 1.0))
          (vertical ((height . 5) (width . 15)
                     (user-position . t)
@@ -13913,7 +14198,7 @@ won't change the window configuration.  If you always want to force the
 Fiddling with fonts and faces used to be very difficult, but these days
 it is very simple.  You simply say @kbd{M-x customize-face}, pick out
 the face you want to alter, and alter it via the standard Customize
-interface.  
+interface.
 
 
 @node Compilation
@@ -13929,7 +14214,7 @@ on.  Now, Gnus will of course heed whatever these variables are, but,
 unfortunately, changing them will mean a quite significant slow-down.
 (The default values of these variables have byte-compiled functions
 associated with them, while the user-generated versions do not, of
-course.) 
+course.)
 
 To help with this, you can run @kbd{M-x gnus-compile} after you've
 fiddled around with the variables and feel that you're (kind of)
@@ -14158,7 +14443,7 @@ been idle for thirty minutes:
 @end lisp
 
 Here's a handler that scans for PGP headers every hour when Emacs is
-idle: 
+idle:
 
 @lisp
 (gnus-demon-scan-pgp 60 t)
@@ -14179,7 +14464,7 @@ be called every @var{time} minutes only when Emacs has been idle for
 
 If @var{idle} is a number and @var{time} is @code{nil}, the function
 will be called once every time Emacs has been idle for @var{idle}
-minutes.  
+minutes.
 
 And if @var{time} is a string, it should look like @samp{07:31}, and
 the function will then be called once every day somewhere near that
@@ -14209,7 +14494,7 @@ your @file{.gnus} file:
 @findex gnus-demon-add-disconnection
 Some ready-made functions to do this have been created:
 @code{gnus-demon-add-nocem}, @code{gnus-demon-add-disconnection},
-@code{gnus-demon-add-nntp-close-connection}, 
+@code{gnus-demon-add-nntp-close-connection},
 @code{gnus-demon-add-scan-timestamps}, @code{gnus-demon-add-rescan}, and
 @code{gnus-demon-add-scanmail}.  Just put those functions in your
 @file{.gnus} if you want those abilities.
@@ -14221,7 +14506,7 @@ If you add handlers to @code{gnus-demon-handlers} directly, you should
 run @code{gnus-demon-init} to make the changes take hold.  To cancel all
 daemons, you can use the @code{gnus-demon-cancel} function.
 
-Note that adding daemons can be pretty naughty if you overdo it.  Adding
+Note that adding daemons can be pretty naughty if you over do it.  Adding
 functions that scan all news and mail from all servers every two seconds
 is a sure-fire way of getting booted off any respectable system.  So
 behave.
@@ -14233,13 +14518,13 @@ behave.
 @cindex spam
 
 @dfn{Spamming} is posting the same article lots and lots of times.
-Spamming is bad.  Spamming is evil.  
+Spamming is bad.  Spamming is evil.
 
 Spamming is usually canceled within a day or so by various anti-spamming
 agencies.  These agencies usually also send out @dfn{NoCeM} messages.
 NoCeM is pronounced ``no see-'em'', and means what the name
 implies---these are messages that make the offending articles, like, go
-away.  
+away.
 
 What use are these NoCeM messages if the articles are canceled anyway?
 Some sites do not honor cancel messages and some sites just honor cancels
@@ -14247,7 +14532,7 @@ from a select few people.  Then you may wish to make use of the NoCeM
 messages, which are distributed in the @samp{alt.nocem.misc} newsgroup.
 
 Gnus can read and parse the messages in this group automatically, and
-this will make spam disappear.  
+this will make spam disappear.
 
 There are some variables to customize, of course:
 
@@ -14255,13 +14540,13 @@ There are some variables to customize, of course:
 @item gnus-use-nocem
 @vindex gnus-use-nocem
 Set this variable to @code{t} to set the ball rolling.  It is @code{nil}
-by default. 
+by default.
 
 @item gnus-nocem-groups
 @vindex gnus-nocem-groups
 Gnus will look for NoCeM messages in the groups in this list.  The
 default is @code{("news.lists.filters" "news.admin.net-abuse.bulletins"
-"alt.nocem.misc" "news.admin.net-abuse.announce")}. 
+"alt.nocem.misc" "news.admin.net-abuse.announce")}.
 
 @item gnus-nocem-issuers
 @vindex gnus-nocem-issuers
@@ -14282,7 +14567,7 @@ usenet abuse than anybody else.
 @item Automoose-1
 @cindex CancelMoose[tm]
 The CancelMoose[tm] on autopilot.  The CancelMoose[tm] is reputed to be
-Norwegian, and was the person(s) who invented NoCeM.  
+Norwegian, and was the person(s) who invented NoCeM.
 
 @item jem@@xpat.com;
 @cindex Jem
@@ -14349,7 +14634,7 @@ This might be dangerous, though.
 @item gnus-nocem-directory
 @vindex gnus-nocem-directory
 This is where Gnus will store its NoCeM cache files.  The default is
-@file{~/News/NoCeM/}. 
+@file{~/News/NoCeM/}.
 
 @item gnus-nocem-expiry-wait
 @vindex gnus-nocem-expiry-wait
@@ -14399,7 +14684,7 @@ The undoability is provided by the @code{gnus-undo-mode} minor mode.  It
 is used if @code{gnus-use-undo} is non-@code{nil}, which is the
 default.  The @kbd{M-C-_} key performs the @code{gnus-undo} command
 command, which should feel kinda like the normal Emacs @code{undo}
-command. 
+command.
 
 
 @node Moderation
@@ -14424,7 +14709,7 @@ If you are the moderator of @samp{rec.zoofle}, this is how it's
 supposed to work:
 
 @enumerate
-@item 
+@item
 You split your incoming mail by matching on
 @samp{Newsgroups:.*rec.zoofle}, which will put all the to-be-posted
 articles in some mail group---for instance, @samp{nnml:rec.zoofle}.
@@ -14495,7 +14780,7 @@ What are Picons?  To quote directly from the Picons Web site:
 @end iflatex
 @end iftex
 
-@quotation 
+@quotation
 @dfn{Picons} is short for ``personal icons''.  They're small,
 constrained images used to represent users and domains on the net,
 organized into databases so that the appropriate image for a given
@@ -14508,12 +14793,12 @@ in either monochrome @code{XBM} format or color @code{XPM} and
 @vindex gnus-picons-piconsearch-url
 If you have a permanent connection to the Internet you can use Steve
 Kinzler's Picons Search engine by setting
-@code{gnus-picons-piconsearch-url} to the string
+@code{gnus-picons-piconsearch-url} to the string @*
 @file{http://www.cs.indiana.edu/picons/search.html}.
 
 @vindex gnus-picons-database
 Otherwise you need a local copy of his database.  For instructions on
-obtaining and installing the picons databases, point your Web browser at
+obtaining and installing the picons databases, point your Web browser at @*
 @file{http://www.cs.indiana.edu/picons/ftp/index.html}.  Gnus expects
 picons to be installed into a location pointed to by
 @code{gnus-picons-database}.
@@ -14545,9 +14830,10 @@ To enable displaying picons, simply put the following line in your
 
 @lisp
 (setq gnus-use-picons t)
-(add-hook 'gnus-article-display-hook 'gnus-article-display-picons t)
-(add-hook 'gnus-summary-prepare-hook 'gnus-group-display-picons t)
-(add-hook 'gnus-article-display-hook 'gnus-picons-article-display-x-face)
+(add-hook 'gnus-article-display-hook
+          'gnus-article-display-picons t)
+(add-hook 'gnus-article-display-hook
+          'gnus-picons-article-display-x-face)
 @end lisp
 
 and make sure @code{gnus-picons-database} points to the directory
@@ -14556,12 +14842,13 @@ containing the Picons databases.
 Alternatively if you want to use the web piconsearch engine add this:
 
 @lisp
-(setq gnus-picons-piconsearch-url "http://www.cs.indiana.edu:800/piconsearch")
+(setq gnus-picons-piconsearch-url
+      "http://www.cs.indiana.edu:800/piconsearch")
 @end lisp
 
 
 @node Hard Picons
-@subsubsection Hard Picons 
+@subsubsection Hard Picons
 
 @iftex
 @iflatex
@@ -14576,7 +14863,7 @@ author's face picture(s), and the authors domain.  To enable this
 feature, you need to select where to get the picons from, and where to
 display them.
 
-@table @code 
+@table @code
 
 @item gnus-picons-database
 @vindex gnus-picons-database
@@ -14594,8 +14881,8 @@ workaround network delays, icons will be fetched in the background.  If
 this is @code{nil} 'the default), then picons are fetched from local
 database indicated by @code{gnus-picons-database}.
 
-@item gnus-picons-display-where 
-@vindex gnus-picons-display-where 
+@item gnus-picons-display-where
+@vindex gnus-picons-display-where
 Where the picon images should be displayed.  It is @code{picons} by
 default (which by default maps to the buffer @samp{*Picons*}).  Other
 valid places could be @code{article}, @code{summary}, or
@@ -14606,7 +14893,7 @@ routines---@pxref{Windows Configuration}.
 @item gnus-picons-group-excluded-groups
 @vindex gnus-picons-group-excluded-groups
 Groups that are matched by this regexp won't have their group icons
-displayed. 
+displayed.
 
 @end table
 
@@ -14626,13 +14913,6 @@ Looks up and displays the picons for the author and the author's domain
 in the @code{gnus-picons-display-where} buffer.  Should be added to the
 @code{gnus-article-display-hook}.
 
-@item gnus-group-display-picons
-@findex gnus-article-display-picons
-Displays picons representing the current group.  This function should
-be added to the @code{gnus-summary-prepare-hook} or to the
-@code{gnus-article-display-hook} if @code{gnus-picons-display-where}
-is set to @code{article}.
-
 @item gnus-picons-article-display-x-face
 @findex gnus-article-display-picons
 Decodes and displays the X-Face header if present.  This function
@@ -14859,14 +15139,14 @@ foreground and background color of the splash page glyph.
 @item gnus-xmas-logo-color-style
 @vindex gnus-xmas-logo-color-style
 This is the key used to look up the color in the alist described above.
-Legal values include @code{flame}, @code{pine}, @code{moss},
+Valid values include @code{flame}, @code{pine}, @code{moss},
 @code{irish}, @code{sky}, @code{tin}, @code{velvet}, @code{grape},
 @code{labia}, @code{berry}, @code{neutral}, and @code{september}.
 
 @item gnus-xmas-modeline-glyph
 @vindex gnus-xmas-modeline-glyph
 A glyph displayed in all Gnus mode lines.  It is a tiny gnu head by
-default. 
+default.
 
 @iftex
 @iflatex
@@ -14884,7 +15164,7 @@ default.
 @cindex fuzzy matching
 
 Gnus provides @dfn{fuzzy matching} of @code{Subject} lines when doing
-things like scoring, thread gathering and thread comparison.  
+things like scoring, thread gathering and thread comparison.
 
 As opposed to regular expression matching, fuzzy matching is very fuzzy.
 It's so fuzzy that there's not even a definition of what @dfn{fuzziness}
@@ -14918,7 +15198,7 @@ The biggest problem I have with email spam is that it comes in under
 false pretenses.  I press @kbd{g} and Gnus merrily informs me that I
 have 10 new emails.  I say ``Golly gee!  Happy is me!'' and select the
 mail group, only to find two pyramid schemes, seven advertisements
-(``New!  Miracle tonic for growing full, lustrouos hair on your toes!'')
+(``New!  Miracle tonic for growing full, lustrous hair on your toes!'')
 and one mail asking me to repent and find some god.
 
 This is annoying.
@@ -14960,7 +15240,7 @@ header, it's probably ok.  All the rest goes to the @samp{spam} group.
 In addition, many mail spammers talk directly to your @code{smtp} server
 and do not include your email address explicitly in the @code{To}
 header.  Why they do this is unknown---perhaps it's to thwart this
-twarting scheme?  In any case, this is trivial to deal with---you just
+thwarting scheme?  In any case, this is trivial to deal with---you just
 put anything not addressed to you in the @samp{spam} group by ending
 your fancy split rule in this way:
 
@@ -14978,15 +15258,15 @@ citizen, you can even send off complaints to the proper authorities on
 each unsolicited commercial email---at your leisure.
 
 If you are also a lazy net citizen, you will probably prefer complaining
-automatically with the @file{gnus-junk.el} package, availiable FOR FREE
-at @file{<URL:http://stud2.tuwien.ac.at/~e9426626/gnus-junk.html>}.
+automatically with the @file{gnus-junk.el} package, available FOR FREE
+at @* @file{<URL:http://stud2.tuwien.ac.at/~e9426626/gnus-junk.html>}.
 Since most e-mail spam is sent automatically, this may reconcile the
 cosmic balance somewhat.
 
 This works for me.  It allows people an easy way to contact me (they can
 just press @kbd{r} in the usual way), and I'm not bothered at all with
 spam.  It's a win-win situation.  Forging @code{From} headers to point
-to non-existant domains is yucky, in my opinion.
+to non-existent domains is yucky, in my opinion.
 
 
 @node Various Various
@@ -15006,6 +15286,11 @@ Most Gnus storage path variables will be initialized from this variable,
 which defaults to the @samp{SAVEDIR} environment variable, or
 @file{~/News/} if that variable isn't set.
 
+Note that Gnus is mostly loaded when the @file{.gnus.el} file is read.
+This means that other directory variables that are initialized from this
+variable won't be set properly if you set this variable in
+@file{.gnus.el}.  Set this variable in @file{.emacs} instead.
+
 @item gnus-default-directory
 @vindex gnus-default-directory
 Not related to the above variable at all---this variable says what the
@@ -15037,15 +15322,15 @@ on finding a separator line between the head and the body.  If this
 variable is @code{nil}, there is no upper read bound.  If it is
 @code{t}, the backends won't try to read the articles piece by piece,
 but read the entire articles.  This makes sense with some versions of
-@code{ange-ftp} or @code{efs}. 
+@code{ange-ftp} or @code{efs}.
 
 @item nnheader-head-chop-length
 @vindex nnheader-head-chop-length
 This variable (default 2048) says how big a piece of each article to
 read when doing the operation described above.
 
-@item nnheader-file-name-translation-alist 
-@vindex nnheader-file-name-translation-alist 
+@item nnheader-file-name-translation-alist
+@vindex nnheader-file-name-translation-alist
 @cindex file names
 @cindex invalid characters in file names
 @cindex characters in file names
@@ -15054,7 +15339,7 @@ For instance, if @samp{:} is invalid as a file character in file names
 on your system (you OS/2 user you), you could say something like:
 
 @lisp
-(setq nnheader-file-name-translation-alist 
+(setq nnheader-file-name-translation-alist
       '((?: . ?_)))
 @end lisp
 
@@ -15075,7 +15360,7 @@ some headers.  I don't see why you'd want that, though.
 
 @item gnus-shell-command-separator
 @vindex gnus-shell-command-separator
-String used to separate two shell commands.  The default is @samp{;}. 
+String used to separate two shell commands.  The default is @samp{;}.
 
 
 @end table
@@ -15085,7 +15370,7 @@ String used to separate two shell commands.  The default is @samp{;}.
 @chapter The End
 
 Well, that's the manual---you can get on with your life now.  Keep in
-touch.  Say hello to your cats from me.  
+touch.  Say hello to your cats from me.
 
 My @strong{ghod}---I just can't stand goodbyes.  Sniffle.
 
@@ -15134,7 +15419,7 @@ but at the common table.@*
 
 If you want to investigate the person responsible for this outrage, you
 can point your (feh!) web browser to
-@file{http://www.ifi.uio.no/~larsi/}.  This is also the primary
+@file{http://www.stud.ifi.uio.no/~larsi/}.  This is also the primary
 distribution point for the new and spiffy versions of Gnus, and is known
 as The Site That Destroys Newsrcs And Drives People Mad.
 
@@ -15158,7 +15443,10 @@ In May 1996 the next Gnus generation (aka. ``September Gnus'' (after 99
 releases)) was released under the name ``Gnus 5.2'' (40 releases).
 
 On July 28th 1996 work on Red Gnus was begun, and it was released on
-January 25th 1997 (after 84 releases) as ``Gnus 5.4''.
+January 25th 1997 (after 84 releases) as ``Gnus 5.4'' (67 releases).
+
+On September 13th 1997, Quassia Gnus was started and lasted 37
+releases.  If was released as ``Gnus 5.6 on March 8th 1998.
 
 If you happen upon a version of Gnus that has a prefixed name --
 ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'' --
@@ -15172,7 +15460,7 @@ to that instead.
 * Compatibility::       Just how compatible is Gnus with @sc{gnus}?
 * Conformity::          Gnus tries to conform to all standards.
 * Emacsen::             Gnus can be run on a few modern Emacsen.
-* Contributors::        Oodles of people.  
+* Contributors::        Oodles of people.
 * New Features::        Pointers to some of the new stuff in Gnus.
 * Newest Features::     Features so new that they haven't been written yet.
 @end menu
@@ -15181,7 +15469,7 @@ to that instead.
 @node Why?
 @subsection Why?
 
-What's the point of Gnus?  
+What's the point of Gnus?
 
 I want to provide a ``rad'', ``happening'', ``way cool'' and ``hep''
 newsreader, that lets you do anything you can think of.  That was my
@@ -15225,7 +15513,7 @@ All commands have kept their names.  Some internal functions have changed
 their names.
 
 The @code{gnus-uu} package has changed drastically. @xref{Decoding
-Articles}. 
+Articles}.
 
 One major compatibility question is the presence of several summary
 buffers.  All variables relevant while reading a group are
@@ -15271,6 +15559,12 @@ Overall, a casual user who hasn't written much code that depends on
 @sc{gnus} internals should suffer no problems.  If problems occur,
 please let me know by issuing that magic command @kbd{M-x gnus-bug}.
 
+@vindex gnus-bug-create-help-buffer
+If you are in the habit of sending bug reports @emph{very} often, you
+may find the helpful help buffer annoying after a while.  If so, set
+@code{gnus-bug-create-help-buffer} to @code{nil} to avoid having it pop
+up at you.
+
 
 @node Conformity
 @subsection Conformity
@@ -15323,7 +15617,7 @@ know.
 
 Gnus should work on :
 
-@itemize @bullet 
+@itemize @bullet
 
 @item
 Emacs 19.32 and up.
@@ -15331,18 +15625,18 @@ Emacs 19.32 and up.
 @item
 XEmacs 19.14 and up.
 
-@item 
+@item
 Mule versions based on Emacs 19.32 and up.
 
 @end itemize
 
 Gnus will absolutely not work on any Emacsen older than that.  Not
-reliably, at least. 
+reliably, at least.
 
 There are some vague differences between Gnus on the various
 platforms---XEmacs features more graphics (a logo and a toolbar)---but
 other than that, things should look pretty much the same under all
-Emacsen. 
+Emacsen.
 
 
 @node Contributors
@@ -15365,85 +15659,86 @@ wrong show.
 
 @itemize @bullet
 
-@item 
+@item
 Masanobu @sc{Umeda}---the writer of the original @sc{gnus}.
 
-@item 
+@item
 Per Abrahamsen---custom, scoring, highlighting and @sc{soup} code (as
 well as numerous other things).
 
-@item 
+@item
 Luis Fernandes---design and graphics.
 
 @item
 Erik Naggum---help, ideas, support, code and stuff.
 
-@item 
+@item
 Wes Hardaker---@file{gnus-picon.el} and the manual section on
 @dfn{picons} (@pxref{Picons}).
 
 @item
 Kim-Minh Kaplan---further work on the picon code.
 
-@item 
+@item
 Brad Miller---@file{gnus-gl.el} and the GroupLens manual section
 (@pxref{GroupLens}).
 
-@item 
+@item
 Sudish Joseph---innumerable bug fixes.
 
-@item 
+@item
 Ilja Weis---@file{gnus-topic.el}.
 
-@item 
+@item
 Steven L. Baur---lots and lots and lots of bugs detections and fixes.
 
-@item 
+@item
 Vladimir Alexiev---the refcard and reference booklets.
 
-@item 
-Felix Lee & Jamie Zawinsky---I stole some pieces from the XGnus
+@item
+Felix Lee & Jamie Zawinski---I stole some pieces from the XGnus
 distribution by Felix Lee and JWZ.
 
-@item 
+@item
 Scott Byer---@file{nnfolder.el} enhancements & rewrite.
 
-@item 
+@item
 Peter Mutsaers---orphan article scoring code.
 
-@item 
+@item
 Ken Raeburn---POP mail support.
 
-@item 
+@item
 Hallvard B Furuseth---various bits and pieces, especially dealing with
 .newsrc files.
 
-@item 
+@item
 Brian Edmonds---@file{gnus-bbdb.el}.
 
 @item
-David Moore---rewrite of @file{nnvirtual.el} and many other things. 
+David Moore---rewrite of @file{nnvirtual.el} and many other things.
 
-@item 
+@item
 Kevin Davidson---came up with the name @dfn{ding}, so blame him.
 
 @item
-François Pinard---many, many interesting and thorough bug reports.
+François Pinard---many, many interesting and thorough bug reports, as
+well as autoconf support.
 
 @end itemize
 
 This manual was proof-read by Adrian Aichner, with Ricardo Nassif, Mark
 Borges, and Jost Krieger proof-reading parts of the manual.
 
-The following people have contributed many patches and suggestions: 
+The following people have contributed many patches and suggestions:
 
 Christopher Davis,
 Andrew Eskilsson,
 Kai Grossjohann,
 David Kågedal,
 Richard Pieri,
-Fabrice Popineau, 
-Daniel Quinlan, 
+Fabrice Popineau,
+Daniel Quinlan,
 Jason L. Tibbitts, III,
 and
 Jack Vinson.
@@ -15452,9 +15747,12 @@ Also thanks to the following for patches and stuff:
 
 Jari Aalto,
 Adrian Aichner,
-Peter Arius, 
+Vladimir Alexiev,
+Russ Allbery,
+Peter Arius,
 Matt Armstrong,
 Marc Auslander,
+Frank Bennett,
 Robert Bihlmeyer,
 Chris Bone,
 Mark Borges,
@@ -15462,21 +15760,27 @@ Mark Boyns,
 Lance A. Brown,
 Kees de Bruin,
 Martin Buchholz,
+Joe Buehler,
 Kevin Buhr,
 Alastair Burt,
 Joao Cachopo,
 Zlatko Calusic,
 Massimo Campostrini,
+Castor,
+David Charlap,
 Dan Christensen,
+Kevin Christian,
 Michael R. Cook,
-Glenn Coombs, 
-Frank D. Cringle, 
+Glenn Coombs,
+Frank D. Cringle,
 Geoffrey T. Dairiki,
 Andre Deparade,
 Ulrik Dickow,
 Dave Disser,
+Rui-Tao Dong, @c ?
 Joev Dubach,
 Michael Welsh Duggan,
+Dave Edmondson,
 Paul Eggert,
 Enami Tsugutomo, @c Enami
 Michael Ernst,
@@ -15484,28 +15788,33 @@ Luc Van Eycken,
 Sam Falkner,
 Nelson Jose dos Santos Ferreira,
 Sigbjorn Finne,
+Decklin Foster,
 Gary D. Foster,
-Paul Franklin, 
+Paul Franklin,
 Guy Geens,
 Arne Georg Gleditsch,
 David S. Goldberg,
 Michelangelo Grigni,
-D. Hall, 
+D. Hall,
 Magnus Hammerin,
 Kenichi Handa, @c Handa
 Raja R. Harinath,
+Yoshiki Hayashi, @c ?
+P. E. Jareth Hein,
 Hisashige Kenji, @c Hisashige
 Marc Horowitz,
 Gunnar Horrigmo,
+Richard Hoskins,
 Brad Howes,
 François Felix Ingrand,
 Ishikawa Ichiro, @c Ishikawa
-Lee Iverson, 
+Lee Iverson,
 Iwamuro Motonori, @c Iwamuro
 Rajappa Iyer,
 Andreas Jaeger,
 Randell Jesup,
-Fred Johansen, 
+Fred Johansen,
+Simon Josefsson,
 Greg Klanderman,
 Karl Kleinpaste,
 Peter Skov Knudsen,
@@ -15518,10 +15827,13 @@ James LewisMoss,
 Christian Limpach,
 Markus Linnala,
 Dave Love,
+Mike McEwan,
 Tonny Madsen,
 Shlomo Mahlab,
 Nat Makarevitch,
+Istvan Marko,
 David Martin,
+Jason R. Mastaler,
 Gordon Matzigkeit,
 Timo Metzemakers,
 Richard Mlynarik,
@@ -15530,6 +15842,7 @@ Morioka Tomohiko, @c Morioka
 Erik Toubro Nielsen,
 Hrvoje Niksic,
 Andy Norman,
+Fred Oberhauser,
 C. R. Oldham,
 Alexandre Oliva,
 Ken Olstad,
@@ -15537,21 +15850,31 @@ Masaharu Onishi, @c Onishi
 Hideki Ono, @c Ono
 William Perry,
 Stephen Peters,
+Jens-Ulrik Holger Petersen,
 Ulrich Pfeifer,
 John McClary Prevost,
+Mike Pullen,
+Jim Radford,
 Colin Rafferty,
+Lasse Rasinen,
 Lars Balker Rasmussen,
+Joe Reiss,
+Renaud Rioboo,
+Roland B. Roberts,
 Bart Robinson,
+Christian von Roques,
 Jason Rumney,
+Wolfgang Rupprecht,
 Jay Sachs,
 Dewey M. Sasser,
 Loren Schall,
 Dan Schmidt,
 Ralph Schleicher,
 Philippe Schnoebelen,
+Andreas Schwab,
 Randal L. Schwartz,
 Justin Sheehy,
-Danny Siu, 
+Danny Siu,
 Matt Simmons,
 Paul D. Smith,
 Jeff Sparkes,
@@ -15559,30 +15882,34 @@ Toby Speight,
 Michael Sperber,
 Darren Stalder,
 Richard Stallman,
-Greg Stark, 
+Greg Stark,
+Sam Steingold,
 Paul Stodghill,
 Kurt Swanson,
-Samuel Tardieu, 
+Samuel Tardieu,
 Teddy,
 Chuck Thompson,
 Philippe Troin,
 James Troup,
-Aaron M. Ucko, 
+Aaron M. Ucko,
+Aki Vehtari,
 Didier Verna,
 Jan Vroonhof,
 Stefan Waldherr,
+Pete Ware,
 Barry A. Warsaw,
 Christoph Wedler,
 Joe Wells,
+Katsumi Yamaoka, @c Yamaoka
 and
-Katsumi Yamaoka. @c Yamaoka
+Shenghuo Zhu. @c Zhu
 
 For a full overview of what each person has done, the ChangeLogs
 included in the Gnus alpha distributions should give ample reading
 (550kB and counting).
 
 Apologies to everybody that I've forgotten, of which there are many, I'm
-sure.  
+sure.
 
 Gee, that's quite a list of people.  I guess that must mean that there
 actually are people who are using Gnus.  Who'd'a thunk it!
@@ -15596,6 +15923,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * ding Gnus::          New things in Gnus 5.0/5.1, the first new Gnus.
 * September Gnus::     The Thing Formally Known As Gnus 5.3/5.3.
 * Red Gnus::           Third time best---Gnus 5.4/5.5.
+* Quassia Gnus::       Two times two is four, or Gnus 5.6.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
@@ -15612,19 +15940,19 @@ New features in Gnus 5.0/5.1:
 
 @item
 The look of all buffers can be changed by setting format-like variables
-(@pxref{Group Buffer Format} and @pxref{Summary Buffer Format}). 
- 
-@item 
+(@pxref{Group Buffer Format} and @pxref{Summary Buffer Format}).
+
+@item
 Local spool and several @sc{nntp} servers can be used at once
-(@pxref{Select Methods}).  
+(@pxref{Select Methods}).
 
-@item 
+@item
 You can combine groups into virtual groups (@pxref{Virtual Groups}).
 
-@item 
+@item
 You can read a number of different mail formats (@pxref{Getting Mail}).
 All the mail backends implement a convenient mail expiry scheme
-(@pxref{Expiring Mail}). 
+(@pxref{Expiring Mail}).
 
 @item
 Gnus can use various strategies for gathering threads that have lost
@@ -15632,67 +15960,67 @@ their roots (thereby gathering loose sub-threads into one thread) or it
 can go back and retrieve enough headers to build a complete thread
 (@pxref{Customizing Threading}).
 
-@item 
+@item
 Killed groups can be displayed in the group buffer, and you can read
 them as well (@pxref{Listing Groups}).
 
-@item 
+@item
 Gnus can do partial group updates---you do not have to retrieve the
 entire active file just to check for new articles in a few groups
 (@pxref{The Active File}).
 
-@item 
+@item
 Gnus implements a sliding scale of subscribedness to groups
 (@pxref{Group Levels}).
 
-@item 
+@item
 You can score articles according to any number of criteria
 (@pxref{Scoring}).  You can even get Gnus to find out how to score
 articles for you (@pxref{Adaptive Scoring}).
 
-@item 
+@item
 Gnus maintains a dribble buffer that is auto-saved the normal Emacs
 manner, so it should be difficult to lose much data on what you have
-read if your machine should go down (@pxref{Auto Save}). 
+read if your machine should go down (@pxref{Auto Save}).
 
-@item 
+@item
 Gnus now has its own startup file (@file{.gnus}) to avoid cluttering up
 the @file{.emacs} file.
 
-@item 
+@item
 You can set the process mark on both groups and articles and perform
 operations on all the marked items (@pxref{Process/Prefix}).
 
-@item 
+@item
 You can grep through a subset of groups and create a group from the
-results (@pxref{Kibozed Groups}). 
+results (@pxref{Kibozed Groups}).
 
-@item 
+@item
 You can list subsets of groups according to, well, anything
-(@pxref{Listing Groups}). 
+(@pxref{Listing Groups}).
 
-@item 
+@item
 You can browse foreign servers and subscribe to groups from those
-servers (@pxref{Browse Foreign Server}). 
+servers (@pxref{Browse Foreign Server}).
 
-@item 
+@item
 Gnus can fetch articles, asynchronously, on a second connection to the
 server (@pxref{Asynchronous Fetching}).
 
-@item 
-You can cache articles locally (@pxref{Article Caching}). 
+@item
+You can cache articles locally (@pxref{Article Caching}).
 
-@item 
+@item
 The uudecode functions have been expanded and generalized
-(@pxref{Decoding Articles}). 
+(@pxref{Decoding Articles}).
 
 @item
 You can still post uuencoded articles, which was a little-known feature
-of @sc{gnus}' past (@pxref{Uuencoding and Posting}). 
+of @sc{gnus}' past (@pxref{Uuencoding and Posting}).
 
 @item
 Fetching parents (and other articles) now actually works without
-glitches (@pxref{Finding the Parent}). 
+glitches (@pxref{Finding the Parent}).
 
 @item
 Gnus can fetch FAQs and group descriptions (@pxref{Group Information}).
@@ -15701,13 +16029,13 @@ Gnus can fetch FAQs and group descriptions (@pxref{Group Information}).
 Digests (and other files) can be used as the basis for groups
 (@pxref{Document Groups}).
 
-@item 
+@item
 Articles can be highlighted and customized (@pxref{Customizing
-Articles}). 
+Articles}).
 
-@item 
+@item
 URLs and other external references can be buttonized (@pxref{Article
-Buttons}). 
+Buttons}).
 
 @item
 You can do lots of strange stuff with the Gnus window & frame
@@ -15715,7 +16043,7 @@ configuration (@pxref{Windows Configuration}).
 
 @item
 You can click on buttons instead of using the keyboard
-(@pxref{Buttons}). 
+(@pxref{Buttons}).
 
 @end itemize
 
@@ -15741,7 +16069,7 @@ now obsolete.
 @item
 Gnus is now able to generate @dfn{sparse} threads---threads where
 missing articles are represented by empty nodes (@pxref{Customizing
-Threading}). 
+Threading}).
 
 @lisp
 (setq gnus-build-sparse-threads 'some)
@@ -15749,17 +16077,17 @@ Threading}).
 
 @item
 Outgoing articles are stored on a special archive server
-(@pxref{Archived Messages}). 
+(@pxref{Archived Messages}).
 
 @item
 Partial thread regeneration now happens when articles are
-referred. 
+referred.
 
 @item
 Gnus can make use of GroupLens predictions (@pxref{GroupLens}).
 
 @item
-Picons (personal icons) can be displayed under XEmacs (@pxref{Picons}). 
+Picons (personal icons) can be displayed under XEmacs (@pxref{Picons}).
 
 @item
 A @code{trn}-like tree buffer can be displayed (@pxref{Tree Display}).
@@ -15778,7 +16106,7 @@ buffers (@pxref{Pick and Read}).
 
 @item
 In binary groups you can use a special binary minor mode (@pxref{Binary
-Groups}). 
+Groups}).
 
 @item
 Groups can be grouped in a folding topic hierarchy (@pxref{Group
@@ -15850,7 +16178,7 @@ All functions for hiding article elements are now toggles.
 Article headers can be buttonized (@pxref{Article Washing}).
 
 @lisp
-(add-hook 'gnus-article-display-hook 
+(add-hook 'gnus-article-display-hook
           'gnus-article-add-buttons-to-head)
 @end lisp
 
@@ -15862,7 +16190,7 @@ Duplicate mail can now be treated properly (@pxref{Duplicates}).
 
 @item
 All summary mode commands are available directly from the article
-buffer (@pxref{Article Keymap}). 
+buffer (@pxref{Article Keymap}).
 
 @item
 Frames can be part of @code{gnus-buffer-configuration} (@pxref{Windows
@@ -15891,7 +16219,7 @@ Groups can be made permanently visible (@pxref{Listing Groups}).
 @end lisp
 
 @item
-Many new hooks have been introduced to make customizing easier. 
+Many new hooks have been introduced to make customizing easier.
 
 @item
 Gnus respects the @code{Mail-Copies-To} header.
@@ -15901,13 +16229,13 @@ Threads can be gathered by looking at the @code{References} header
 (@pxref{Customizing Threading}).
 
 @lisp
-(setq gnus-summary-thread-gathering-function 
+(setq gnus-summary-thread-gathering-function
       'gnus-gather-threads-by-references)
 @end lisp
 
 @item
 Read articles can be stored in a special backlog buffer to avoid
-refetching (@pxref{Article Backlog}).  
+refetching (@pxref{Article Backlog}).
 
 @lisp
 (setq gnus-keep-backlog 50)
@@ -15922,7 +16250,7 @@ Gnus can suggest where to save articles (@pxref{Saving Articles}).
 
 @item
 Gnus doesn't have to do as much prompting when saving (@pxref{Saving
-Articles}). 
+Articles}).
 
 @lisp
 (setq gnus-prompt-before-saving t)
@@ -15930,7 +16258,7 @@ Articles}).
 
 @item
 @code{gnus-uu} can view decoded files asynchronously while fetching
-articles (@pxref{Other Decode Variables}). 
+articles (@pxref{Other Decode Variables}).
 
 @lisp
 (setq gnus-uu-grabbed-file-functions 'gnus-uu-grab-view)
@@ -15952,7 +16280,7 @@ cited text to hide is now customizable (@pxref{Article Hiding}).
 Boring headers can be hidden (@pxref{Article Hiding}).
 
 @lisp
-(add-hook 'gnus-article-display-hook 
+(add-hook 'gnus-article-display-hook
           'gnus-article-hide-boring-headers t)
 @end lisp
 
@@ -15982,8 +16310,8 @@ New features in Gnus 5.4/5.5:
 @file{nntp.el} has been totally rewritten in an asynchronous fashion.
 
 @item
-Article prefetching functionality has been moved up into 
-Gnus (@pxref{Asynchronous Fetching}).  
+Article prefetching functionality has been moved up into
+Gnus (@pxref{Asynchronous Fetching}).
 
 @item
 Scoring can now be performed with logical operators like @code{and},
@@ -16012,7 +16340,7 @@ been added.
 
 @item
 @code{nndoc} was rewritten to be easily extendable (@pxref{Document
-Server Internals}). 
+Server Internals}).
 
 @item
 Groups can inherit group parameters from parent topics (@pxref{Topic
@@ -16048,7 +16376,7 @@ Scoring can be done on words using the new score type @code{w}
 
 @item
 Adaptive scoring can be done on a Subject word-by-word basis
-(@pxref{Adaptive Scoring}). 
+(@pxref{Adaptive Scoring}).
 
 @lisp
 (setq gnus-use-adaptive-scoring '(word))
@@ -16056,7 +16384,7 @@ Adaptive scoring can be done on a Subject word-by-word basis
 
 @item
 Scores can be decayed (@pxref{Score Decays}).
- 
+
 @lisp
 (setq gnus-decay-scores t)
 @end lisp
@@ -16072,7 +16400,7 @@ the native server (@pxref{Changing Servers}).
 @item
 A new command for reading collections of documents
 (@code{nndoc} with @code{nnvirtual} on top) has been added---@kbd{M-C-d}
-(@pxref{Really Various Summary Commands}). 
+(@pxref{Really Various Summary Commands}).
 
 @item
 Process mark sets can be pushed and popped (@pxref{Setting Process
@@ -16121,9 +16449,140 @@ mail before saving the mail (@pxref{Washing Mail}).
 Emphasized text can be properly fontisized:
 
 @lisp
-(add-hook 'gnus-article-display-hook 'gnus-article-emphasize)
+(add-hook 'gnus-article-display-hook
+          'gnus-article-emphasize)
 @end lisp
- 
+
+@end itemize
+
+
+@node Quassia Gnus
+@subsubsection Quassia Gnus
+
+New features in Gnus 5.6:
+
+@itemize @bullet
+
+@item
+New functionality for using Gnus as an offline newsreader has been
+added.  A plethora of new commands and modes have been added.  See
+@pxref{Gnus Unplugged} for the full story.
+
+@item
+ The @code{nndraft} backend has returned, but works differently than
+before.  All Message buffers are now also articles in the @code{nndraft}
+group, which is created automatically.
+
+@item
+@code{gnus-alter-header-function} can now be used to alter header
+values.
+
+@item
+ @code{gnus-summary-goto-article} now accept Message-ID's.
+
+@item
+ A new Message command for deleting text in the body of a message
+outside the region: @kbd{C-c C-v}.
+
+@item
+ You can now post to component group in @code{nnvirtual} groups with
+@kbd{C-u C-c C-c}.
+
+@item
+ @code{nntp-rlogin-program}---new variable to ease customization.
+
+@item
+ @code{C-u C-c C-c} in @code{gnus-article-edit-mode} will now inhibit
+re-highlighting of the article buffer.
+
+@item
+ New element in @code{gnus-boring-article-headers}---@code{long-to}.
+
+@item
+ @kbd{M-i} symbolic prefix command.  See the section "Symbolic
+Prefixes" in the Gnus manual for details.
+
+@item
+ @kbd{L} and @kbd{I} in the summary buffer now take the symbolic prefix
+@kbd{a} to add the score rule to the "all.SCORE" file.
+
+@item
+ @code{gnus-simplify-subject-functions} variable to allow greater
+control over simplification.
+
+@item
+ @kbd{A T}---new command for fetching the current thread.
+
+@item
+ @kbd{/ T}---new command for including the current thread in the
+limit.
+
+@item
+ @kbd{M-RET} is a new Message command for breaking cited text.
+
+@item
+ @samp{\\1}-expressions are now valid in @code{nnmail-split-methods}.
+
+@item
+ The @code{custom-face-lookup} function has been removed.
+If you used this function in your initialization files, you must
+rewrite them to use @code{face-spec-set} instead.
+
+@item
+ Canceling now uses the current select method.  Symbolic prefix
+@kbd{a} forces normal posting method.
+
+@item
+ New command to translate M******** sm*rtq**t*s into proper
+text---@kbd{W d}.
+
+@item
+ For easier debugging of @code{nntp}, you can set
+@code{nntp-record-commands} to a non-@code{nil} value.
+
+@item
+ @code{nntp} now uses @file{~/.authinfo}, a @file{.netrc}-like file, for
+controlling where and how to send @sc{authinfo} to @sc{nntp} servers.
+
+@item
+ A command for editing group parameters from the summary buffer
+has been added.
+
+@item
+ A history of where mails have been split is available.
+
+@item
+ A new article date command has been added---@code{article-date-iso8601}.
+
+@item
+ Subjects can be simplified when threading by setting
+@code{gnus-score-thread-simplify}.
+
+@item
+ A new function for citing in Message has been
+added---@code{message-cite-original-without-signature}.
+
+@item
+ @code{article-strip-all-blank-lines}---new article command.
+
+@item
+ A new Message command to kill to the end of the article has
+been added.
+
+@item
+ A minimum adaptive score can be specified by using the
+@code{gnus-adaptive-word-minimum} variable.
+
+@item
+ The "lapsed date" article header can be kept continually
+updated by the @code{gnus-start-date-timer} command.
+
+@item
+ Web listserv archives can be read with the @code{nnlistserv} backend.
+
+@item
+ Old dejanews archives can now be read by @code{nnweb}.
+
 @end itemize
 
 
@@ -16132,7 +16591,7 @@ Emphasized text can be properly fontisized:
 @cindex todo
 
 Also known as the @dfn{todo list}.  Sure to be implemented before the
-next millennium. 
+next millennium.
 
 Be afraid.  Be very afraid.
 
@@ -16145,7 +16604,7 @@ interesting.)
 @itemize @bullet
 
 @item
-Native @sc{mime} support is something that should be done.  
+Native @sc{mime} support is something that should be done.
 
 @item
 Really do unbinhexing.
@@ -16207,14 +16666,14 @@ the crash-box is only appropriate to one specific group.
  nnmh-be-safe means that crossposted articles will
 be marked as unread.
 @item
- Orphan score entries dont show on "V t" score trace
+ Orphan score entries don't show on "V t" score trace
 @item
  when clearing out data, the cache data should also be reset.
 @item
  rewrite gnus-summary-limit-children to be non-recursive
 to avoid exceeding lisp nesting on huge groups.
 @item
- expinged articles are counted when computing scores.
+ expunged articles are counted when computing scores.
 @item
  implement gnus-batch-brew-soup
 @item
@@ -16225,11 +16684,9 @@ stuff just skips past them.  Read articles are the same.
 articles aren't displayed.
 @item
  nndoc should always allocate unique Message-IDs.
-@item
- implement gnus-score-thread
 @item
  If there are mail groups the first time you use Gnus, Gnus'll
-make the mail groups killed. 
+make the mail groups killed.
 @item
  no "no news is good news" when using topics.
 @item
@@ -16255,8 +16712,8 @@ parts.
 @item
  using a virtual server name as `gnus-select-method' doesn't work?
 @item
- when killing/yanking a group from one topic to another in a slave, the 
-master will yank it first to one topic and then add it to another.  
+ when killing/yanking a group from one topic to another in a slave, the
+master will yank it first to one topic and then add it to another.
 Perhaps.
 
 @item
@@ -16287,10 +16744,10 @@ bar and the Gnus bar.
  the selected article show have its Subject displayed in its summary line.
 @item
  when entering groups, get the real number of unread articles from
-the server?  
+the server?
 @item
  sort after gathering threads -- make false roots have the
-headers of the oldest orhpan with a 0 article number?
+headers of the oldest orphan with a 0 article number?
 @item
  nndoc groups should inherit the score files of their parents?  Also
 inherit copy prompts and save files.
@@ -16331,7 +16788,7 @@ has been changed before using it.
 on.  Eg. -- `(("nnml:" . 1))'.
 @item
  easier interface to nnkiboze to create ephemeral groups that
-contaion groups that match a regexp.
+contain groups that match a regexp.
 @item
  allow newlines in <URL:> urls, but remove them before using
 the URL.
@@ -16388,7 +16845,7 @@ whether nneething should sniff all files in the directories.
 @item
  gnus-dont-move-articles-to-same-group variable when respooling.
 @item
- when messages are crossposted between several auto-expirable groups, 
+ when messages are crossposted between several auto-expirable groups,
 articles aren't properly marked as expirable.
 @item
  nneething should allow deletion/moving.
@@ -16396,7 +16853,7 @@ articles aren't properly marked as expirable.
  TAB on the last button should go to the first button.
 @item
  if the car of an element in `mail-split-methods' is a function,
-and the function returns non-nil, use that as the name of the group(s) to 
+and the function returns non-nil, use that as the name of the group(s) to
 save mail in.
 @item
  command for listing all score files that have been applied.
@@ -16409,7 +16866,7 @@ save mail in.
  nnmail-group-spool-alist -- says where each group should use
 as a spool file.
 @item
- when an article is crossposted to an auto-expirable group, the article 
+ when an article is crossposted to an auto-expirable group, the article
 should be marker as expirable.
 @item
  article mode command/menu for "send region as URL to browser".
@@ -16424,7 +16881,7 @@ Also consult Date headers.
 @item
  `1 0 A M' to do matches on the active hashtb.
 @item
- duplicates -- command to remove Gnus-Warning header, use the read 
+ duplicates -- command to remove Gnus-Warning header, use the read
 Message-ID, delete the "original".
 @item
  when replying to several messages at once, put the "other" message-ids
@@ -16454,12 +16911,12 @@ and pipe them to the process.
 the file whenever we read the active file or the list
 of killed groups in the .eld file reaches a certain length.
 @item
- function for starting to edit a file to put into 
+ function for starting to edit a file to put into
 the current mail group.
 @item
- score-find-trace should display the total score of the article. 
+ score-find-trace should display the total score of the article.
 @item
- "ghettozie" -- score on Xref header and nix it out after using it 
+ "ghettozie" -- score on Xref header and nix it out after using it
 to avoid marking as read in other groups it has been crossposted to.
 @item
  look at procmail splitting.  The backends should create
@@ -16467,17 +16924,17 @@ the groups automatically if a spool file exists for that group.
 @item
  function for backends to register themselves with Gnus.
 @item
- when replying to several process-marked articles, 
+ when replying to several process-marked articles,
 have all the From end up in Cc headers?  Variable to toggle.
 @item
- command to delete a crossposted mail article from all 
+ command to delete a crossposted mail article from all
 groups it has been mailed to.
 @item
- `B c' and `B m' should be crosspost aware.  
+ `B c' and `B m' should be crosspost aware.
 @item
  hide-pgp should also hide PGP public key blocks.
 @item
- Command in the group buffer to respoll process-marked groups.
+ Command in the group buffer to respool process-marked groups.
 @item
  `gnus-summary-find-matching' should accept
 pseudo-"headers" like "body", "head" and "all"
@@ -16488,7 +16945,7 @@ newlines) should be ignored.
  Process-marking all groups in a topic should process-mark
 groups in subtopics as well.
 @item
- Add non-native groups to the list of killed groups when killing them. 
+ Add non-native groups to the list of killed groups when killing them.
 @item
  nntp-suggest-kewl-config to probe the nntp server and suggest
 variable settings.
@@ -16530,7 +16987,7 @@ even unread articles.
 @item
  checking for bogus groups should clean topic alists as well.
 @item
- cancelling articles in foreign groups.
+ canceling articles in foreign groups.
 @item
  article number in folded topics isn't properly updated by
 Xref handling.
@@ -16571,12 +17028,12 @@ the entire folder to disk when accepting new messages.
 @item
  a backend for reading collections of babyl files nnbabylfolder?
 @item
- a command for making the native groups into foreign groups. 
+ a command for making the native groups into foreign groups.
 @item
  server mode command for clearing read marks from all groups
 from a server.
 @item
- when following up mulitple articles, include all To, Cc, etc headers
+ when following up multiple articles, include all To, Cc, etc headers
 from all articles.
 @item
  a command for deciding what the total score of the current
@@ -16606,7 +17063,7 @@ that are of that length.
 @item
  be able to control word adaptive scoring from the score files.
 @item
- a variable to make `C-c C-c' post using the "current" select method. 
+ a variable to make `C-c C-c' post using the "current" select method.
 @item
  `limit-exclude-low-scored-articles'.
 @item
@@ -16645,7 +17102,7 @@ and splitting the resulting digests.
 @item
  command to nix out all nnoo state information.
 @item
- nnmail-process-alist that calls functions if group names 
+ nnmail-process-alist that calls functions if group names
 matches an alist -- before saving.
 @item
  use buffer-invisibility-spec everywhere for hiding text.
@@ -16656,7 +17113,7 @@ to get the (new) number of articles.  `gnus-activate-before-entering'.
  command to fetch a Message-ID from any buffer, even
 starting Gnus first if necessary.
 @item
- when posting and checking whether a group exists or not, just 
+ when posting and checking whether a group exists or not, just
 ask the nntp server instead of relying on the active hashtb.
 @item
  buttonize the output of `C-c C-a' in an apropos-like way.
@@ -16667,7 +17124,7 @@ of several groups at once.
  command to create an ephemeral nnvirtual group that
 matches some regexp(s).
 @item
- nndoc should understand "Content-Type: message/rfc822" forwarded messages. 
+ nndoc should understand "Content-Type: message/rfc822" forwarded messages.
 @item
  it should be possible to score "thread" on the From header.
 @item
@@ -16730,7 +17187,7 @@ on article marks.
  a way to visually distinguish slave Gnusae from masters.  (Whip instead
 of normal logo?)
 @item
- Use DJ Bernstein "From " quoting/dequoting, where appliccable.
+ Use DJ Bernstein "From " quoting/dequoting, where applicable.
 @item
  Why is hide-citation-maybe and hide-citation different?  Also
 clear up info.
@@ -16747,7 +17204,7 @@ you could also try to read the archive for that group.  Part of the
 problem is that archives are spread all over the net, unlike FAQs.
 What would be best I suppose is to find the one closest to your site.
 
-In any case, there is a list of general news group archives at
+In any case, there is a list of general news group archives at @*
 ftp://ftp.neosoft.com/pub/users/claird/news.lists/newsgroup_archives.html
 
 
@@ -16776,7 +17233,7 @@ hatt forskjellige serveres startup-filer forskjellige steder.
 
 @item
 LMI> Well, nnbabyl could alter the group info to heed labels like
-LMI> answered and read, I guess.  
+LMI> answered and read, I guess.
 
 It could also keep them updated (the same for the Status: header of
 unix mbox files).
@@ -16789,15 +17246,15 @@ They could be used like this:
 `M u <name> RET' remove label <name> from current message.
 `/ l <expr> RET' limit summary buffer according to <expr>.
 
-<expr> would be a boolean expression on the labels, e.g. 
+<expr> would be a boolean expression on the labels, e.g.
 
-	`/ l bug & !fixed RET'
+`/ l bug & !fixed RET'
 @end example
 
 would show all the messages which are labeled `bug' but not labeled
-`fixed'. 
+`fixed'.
 
-One could also immagine the labels being used for highliting, or
+One could also imagine the labels being used for highlighting, or
 affect the summary line format.
 
 
@@ -16810,7 +17267,7 @@ would recognize things that looks like messages or folders:
 - If it is a directory containing numbered files, create an nndir
 summary buffer.
 
-- For other directories, create a nneething summaru buffer.
+- For other directories, create a nneething summary buffer.
 
 - For files matching "\\`From ", create a nndoc/mbox summary.
 
@@ -16837,7 +17294,7 @@ decend into sci.something ?
 decend into ucd?
 
 The problem above is that since there is really only one subsection of
-science, shouldn't it prompt you for only decending sci.something?  If
+science, shouldn't it prompt you for only descending sci.something?  If
 there was a sci.somethingelse group or section, then it should prompt
 for sci? first the sci.something? then sci.somethingelse?...
 
@@ -16851,23 +17308,23 @@ Ja, det burde v
 What i want is for Gnus to treat any sequence or combination of the following
 as a single spoiler warning and hide it all, replacing it with a "Next Page"
 button:
- 
 
-	^L's
 
-	more than n blank lines
-	
-	more than m identical lines 
-	(which should be replaced with button to show them)
+^L's
+
+more than n blank lines
 
-	any whitespace surrounding any of the above
+more than m identical lines
+(which should be replaced with button to show them)
+
+any whitespace surrounding any of the above
 
 
 @item
 Well, we could allow a new value to `gnus-thread-ignore-subject' --
 `spaces', or something.  (We could even default to that.)  And then
 subjects that differ in white space only could be considered the
-"same" subject for threading purposes. 
+"same" subject for threading purposes.
 
 @item
 Modes to preprocess the contents (e.g. jka-compr) use the second form
@@ -16890,30 +17347,30 @@ Yes. I think the algorithm is as follows:
 Group-mode
 
    show-list-of-articles-in-group
-	if (key-pressed == SPACE) 
-		if (no-more-articles-in-group-to-select) 
-			if (articles-selected)
-				start-reading-selected-articles;
-			junk-unread-articles;
-			next-group;
-		 else 
-			show-next-page;
-		
-	 else if (key-pressed = '.') 
-		if (consolidated-menus)		# same as hide-thread in Gnus
-			select-thread-under-cursor;
-		else
-			select-article-under-cursor;
-	
+        if (key-pressed == SPACE)
+                if (no-more-articles-in-group-to-select)
+                        if (articles-selected)
+                                start-reading-selected-articles;
+                        junk-unread-articles;
+                        next-group;
+                 else
+                        show-next-page;
+
+         else if (key-pressed = '.')
+                if (consolidated-menus)         # same as hide-thread in Gnus
+                        select-thread-under-cursor;
+                else
+                        select-article-under-cursor;
+
 
 Article-mode
-	if (key-pressed == SPACE) 
-		if (more-pages-in-article)
-			next-page;
-		else if (more-selected-articles-to-read)
-			next-article;
-		else 
-			next-group;
+        if (key-pressed == SPACE)
+                if (more-pages-in-article)
+                        next-page;
+                else if (more-selected-articles-to-read)
+                        next-article;
+                else
+                        next-group;
 @end example
 
 @item
@@ -16928,9 +17385,9 @@ the top-level directory only (in case directories would be matched by
 the wildcard expression).
 
 @item
-It would be nice if it also handled 
+It would be nice if it also handled
 
-	<URL:news://sunsite.auc.dk/>
+        <URL:news://sunsite.auc.dk/>
 
 which should correspond to `B nntp RET sunsite.auc.dk' in *Group*.
 
@@ -17093,7 +17550,7 @@ to be able to post in them (using the current select method).
  `x' should retain any sortings that have been performed.
 
 @item
- allow the user to specify the presedence of the secondary marks.  Also
+ allow the user to specify the precedence of the secondary marks.  Also
 allow them to be displayed separately.
 
 @item
@@ -17124,16 +17581,16 @@ Mac, MS (etc) characters into ISO 8859-1.
     (let ((buffer-read-only nil))
       (goto-char (point-min))
       (while (search-forward "\221" nil t)
-	(replace-match "`" t t))
+        (replace-match "`" t t))
       (goto-char (point-min))
       (while (search-forward "\222" nil t)
-	(replace-match "'" t t))
+        (replace-match "'" t t))
       (goto-char (point-min))
       (while (search-forward "\223" nil t)
-	(replace-match "\"" t t))
+        (replace-match "\"" t t))
       (goto-char (point-min))
       (while (search-forward "\224" nil t)
-	(replace-match "\"" t t)))))
+        (replace-match "\"" t t)))))
 @end example
 
 @item
@@ -17141,7 +17598,7 @@ Mac, MS (etc) characters into ISO 8859-1.
  (add-hook 'gnus-exit-query-functions
 '(lambda ()
    (if (and (file-exists-p nnmail-spool-file)
-	    (> (nnheader-file-size nnmail-spool-file) 0))
+            (> (nnheader-file-size nnmail-spool-file) 0))
        (yes-or-no-p "New mail has arrived.  Quit Gnus anyways? ")
        (y-or-n-p "Are you sure you want to quit Gnus? "))))
 @end example
@@ -17161,10 +17618,10 @@ numbers and match on the age of the article.
 >  > > If so, I've got one gripe: It seems that when I fire up gnus 5.2.25
 >  > > under xemacs-19.14, it's creating a new frame, but is erasing the
 >  > > buffer in the frame that it was called from =:-O
-> 
+>
 >  > Hm.  How do you start up Gnus?  From the toolbar or with
->  > `M-x gnus-other-frame'?  
-> 
+>  > `M-x gnus-other-frame'?
+>
 >    I normally start it up from the toolbar; at
 > least that's the way I've caught it doing the
 > deed before.
@@ -17249,7 +17706,7 @@ to something someone else has said.
 
 @item
  Read Netscape discussion groups:
-snews://secnews.netscape.com/netscape.communicator.unix 
+snews://secnews.netscape.com/netscape.communicator.unix
 
 @item
 One command to edit the original version if an article, and one to edit
@@ -17272,6 +17729,57 @@ expired, e.g. (read), (age > 14 days), or the more interesting (read
 New limit command---limit to articles that have a certain string
 in the head or body.
 
+@item
+Allow breaking lengthy NNTP commands.
+
+@item
+gnus-article-highlight-limit, to disable highlighting in big articles.
+
+@item
+Editing an article should put the article to be edited
+in a special, unique buffer.
+
+@item
+A command to send a mail to the admin-address group param.
+
+@item
+A Date scoring type that will match if the article
+is less than a certain number of days old.
+
+@item
+New spec: %~(tab 56) to put point on column 56
+
+@item
+Allow Gnus Agent scoring to use normal score files.
+
+@item
+Rething the Agent active file thing.  `M-g' doesn't update the active
+file, for instance.
+
+@item
+With dummy roots, `^' and then selecing the first article
+in any other dummy thread will make Gnus highlight the
+dummy root instead of the first article.
+
+@item
+Propagate all group properties (marks, article numbers, etc) up to the
+topics for displaying.
+
+@item
+`n' in the group buffer with topics should go to the next group
+with unread articles, even if that group is hidden in a topic.
+
+@item
+gnus-posting-styles doesn't work in drafts.
+
+@item
+gnus-summary-limit-include-cached is slow when there are
+many articles in the cache, since it regenerates big parts of the
+summary buffer for each article.
+
+@item
+Implement gnus-batch-brew-soup.
+
 @item
 Solve the halting problem.
 
@@ -17290,7 +17798,7 @@ This manual was generated from a TeXinfo file and then run through
 either @code{texi2dvi}
 @iflatex
 or my own home-brewed TeXinfo to \LaTeX\ transformer,
-and then run through @code{latex} and @code{dvips} 
+and then run through @code{latex} and @code{dvips}
 @end iflatex
 to get what you hold in your hands now.
 
@@ -17307,7 +17815,7 @@ This is a @kbd{keystroke}
 @item
 This is a @file{file}
 
-@item 
+@item
 This is a @code{symbol}
 
 @end enumerate
@@ -17403,7 +17911,7 @@ A message that has been posted as news.
 @cindex mail message
 A message that has been mailed.
 
-@item message 
+@item message
 @cindex message
 A mail message or news article
 
@@ -17415,11 +17923,11 @@ put.
 @item body
 @cindex body
 The rest of an article.  Everything not in the head is in the
-body. 
+body.
 
 @item header
 @cindex header
-A line from the head of an article. 
+A line from the head of an article.
 
 @item headers
 @cindex headers
@@ -17469,7 +17977,7 @@ The act of asking the server for info on a group and computing the
 number of unread articles is called @dfn{activating the group}.
 Un-activated groups are listed with @samp{*} in the group buffer.
 
-@item server 
+@item server
 @cindex server
 A machine one can connect to and get news (or mail) from.
 
@@ -17488,13 +17996,13 @@ whole is a virtual server.
 @cindex washing
 Taking a buffer and running it through a filter of some sort.  The
 result will (more often than not) be cleaner and more pleasing than the
-original. 
+original.
 
 @item ephemeral groups
 @cindex ephemeral groups
 Most groups store data on what articles you have read.  @dfn{Ephemeral}
 groups are groups that will have no data stored---when you exit the
-group, it'll disappear into the aether.  
+group, it'll disappear into the aether.
 
 @item solid groups
 @cindex solid groups
@@ -17597,8 +18105,9 @@ useful data is in the summary buffer, anyway.  Set this variable to
 @item gnus-article-display-hook
 Set this hook to all the available hiding commands:
 @lisp
-(setq gnus-article-display-hook 
-      '(gnus-article-hide-headers gnus-article-hide-signature
+(setq gnus-article-display-hook
+      '(gnus-article-hide-headers
+        gnus-article-hide-signature
         gnus-article-hide-citation))
 @end lisp
 
@@ -17631,7 +18140,7 @@ sizes a bit if you are running out of space.
 If this is @code{nil}, Gnus will never save @file{.newsrc}---it will
 only save @file{.newsrc.eld}.  This means that you will not be able to
 use any other newsreaders than Gnus.  This variable is @code{t} by
-default. 
+default.
 
 @item gnus-save-killed-list
 If this is @code{nil}, Gnus will not save the list of dead groups.  You
@@ -17688,7 +18197,7 @@ flee}, you have some old @file{.el} files lying around.  Delete these.
 
 @item
 Read the help group (@kbd{G h} in the group buffer) for a FAQ and a
-how-to. 
+how-to.
 
 @item
 @vindex max-lisp-eval-depth
@@ -17714,7 +18223,7 @@ You really can never be too detailed in a bug report.  Always use the
 @kbd{M-x gnus-bug} command when you make bug reports, even if it creates
 a 10Kb mail each time you use it, and even if you have sent me your
 environment 500 times before.  I don't care.  I want the full info each
-time.  
+time.
 
 It is also important to remember that I have no memory whatsoever.  If
 you send a bug report, and I send you a reply, and then you just send
@@ -17753,7 +18262,7 @@ backends (this is written in stone), the format of the score files
 (ditto), data structures (some are less likely to change than others)
 and general methods of operation.
 
-@menu 
+@menu
 * Gnus Utility Functions::   Common functions and variable to use.
 * Backend Interface::        How Gnus communicates with the servers.
 * Score File Syntax::        A BNF definition of the score file standard.
@@ -17801,6 +18310,19 @@ Takes an unprefixed group name and a select method, and returns the full
 @findex gnus-get-info
 Returns the group info list for @var{group}.
 
+@item gnus-group-unread
+@findex gnus-group-unread
+The number of unread articles in @var{group}, or @code{t} if that is
+unknown.
+
+@item gnus-active
+@findex gnus-active
+The active entry for @var{group}.
+
+@item gnus-set-active
+@findex gnus-set-active
+Set the active entry for @var{group}.
+
 @item gnus-add-current-to-buffer-list
 @findex gnus-add-current-to-buffer-list
 Adds the current buffer to the list of buffers to be killed on Gnus
@@ -17895,17 +18417,17 @@ Note that a virtual server name has no relation to some physical server
 name.  Take this example:
 
 @lisp
-(nntp "odd-one" 
-      (nntp-address "ifi.uio.no") 
+(nntp "odd-one"
+      (nntp-address "ifi.uio.no")
       (nntp-port-number 4324))
 @end lisp
 
 Here the virtual server name is @samp{odd-one} while the name of
-the physical server is @samp{ifi.uio.no}. 
+the physical server is @samp{ifi.uio.no}.
 
 The backends should be able to switch between several virtual servers.
 The standard backends implement this by keeping an alist of virtual
-server environments that they pull down/push up when needed.  
+server environments that they pull down/push up when needed.
 
 There are two groups of interface functions: @dfn{required functions},
 which must be present, and @dfn{optional functions}, which Gnus will
@@ -17926,7 +18448,7 @@ only operate on one group at a time, and have no concept of ``server''
 more.
 
 In the examples and definitions I will refer to the imaginary backend
-@code{nnchoke}. 
+@code{nnchoke}.
 
 @cindex @code{nnchoke}
 
@@ -17950,12 +18472,12 @@ In the examples and definitions I will refer to the imaginary backend
 @var{articles} is either a range of article numbers or a list of
 @code{Message-ID}s.  Current backends do not fully support either---only
 sequences (lists) of article numbers, and most backends do not support
-retrieval of @code{Message-ID}s.  But they should try for both. 
+retrieval of @code{Message-ID}s.  But they should try for both.
 
 The result data should either be HEADs or NOV lines, and the result
 value should either be @code{headers} or @code{nov} to reflect this.
 This might later be expanded to @code{various}, which will be a mixture
-of HEADs and NOV lines, but this is currently not supported by Gnus.  
+of HEADs and NOV lines, but this is currently not supported by Gnus.
 
 If @var{fetch-old} is non-@code{nil} it says to try fetching "extra
 headers", in some meaning of the word.  This is generally done by
@@ -17998,7 +18520,7 @@ header         = <text> eol
 
 If the return value is @code{nov}, the data buffer should contain
 @dfn{network overview database} lines.  These are basically fields
-separated by tabs. 
+separated by tabs.
 
 @example
 nov-buffer = *nov-line
@@ -18007,17 +18529,17 @@ field      = <text except TAB>
 @end example
 
 For a closer look at what should be in those fields,
-@pxref{Headers}. 
+@pxref{Headers}.
 
 
 @item (nnchoke-open-server SERVER &optional DEFINITIONS)
 
 @var{server} is here the virtual server name.  @var{definitions} is a
-list of @code{(VARIABLE VALUE)} pairs that define this virtual server. 
+list of @code{(VARIABLE VALUE)} pairs that define this virtual server.
 
 If the server can't be opened, no error should be signaled.  The backend
 may then choose to refuse further attempts at connecting to this
-server.  In fact, it should do so. 
+server.  In fact, it should do so.
 
 If the server is opened already, this function should return a
 non-@code{nil} value.  There should be no data returned.
@@ -18039,7 +18561,7 @@ have reserved.  All buffers that have been created by that backend
 should be killed.  (Not the @code{nntp-server-buffer}, though.)  This
 function is generally only called when Gnus is shutting down.
 
-There should be no data returned. 
+There should be no data returned.
 
 
 @item (nnchoke-server-opened &optional SERVER)
@@ -18054,7 +18576,7 @@ There should be no data returned.
 
 @item (nnchoke-status-message &optional SERVER)
 
-This function should return the last error message from @var{server}. 
+This function should return the last error message from @var{server}.
 
 There should be no data returned.
 
@@ -18083,7 +18605,7 @@ on successful article retrieval.
 @item (nnchoke-request-group GROUP &optional SERVER FAST)
 
 Get data on @var{group}.  This function also has the side effect of
-making @var{group} the current group. 
+making @var{group} the current group.
 
 If @var{FAST}, don't bother to return useful data, just make @var{group}
 the current group.
@@ -18113,7 +18635,7 @@ info         = "211 " 3* [ <number> " " ] <string>
 @item (nnchoke-close-group GROUP &optional SERVER)
 
 Close @var{group} and free any resources connected to it.  This will be
-a no-op on most backends. 
+a no-op on most backends.
 
 There should be no data returned.
 
@@ -18121,7 +18643,7 @@ There should be no data returned.
 @item (nnchoke-request-list &optional SERVER)
 
 Return a list of all groups available on @var{server}.  And that means
-@emph{all}. 
+@emph{all}.
 
 Here's an example from a server that only carries two groups:
 
@@ -18142,7 +18664,7 @@ flags       = "n" / "y" / "m" / "x" / "j" / "=" name
 
 The flag says whether the group is read-only (@samp{n}), is moderated
 (@samp{m}), is dead (@samp{x}), is aliased to some other group
-(@samp{=other-group}) or none of the above (@samp{y}). 
+(@samp{=other-group}) or none of the above (@samp{y}).
 
 
 @item (nnchoke-request-post &optional SERVER)
@@ -18154,7 +18676,7 @@ completed by the time this function concludes.  In that case, this
 function should set up some kind of sentinel to beep the user loud and
 clear if the posting could not be completed.
 
-There should be no result data from this function. 
+There should be no result data from this function.
 
 @end table
 
@@ -18212,12 +18734,12 @@ If the user tries to set a mark that the backend doesn't like, this
 function may change the mark.  Gnus will use whatever this function
 returns as the mark for @var{article} instead of the original
 @var{mark}.  If the backend doesn't care, it must return the original
-@var{mark}, and not @code{nil} or any other type of garbage.  
+@var{mark}, and not @code{nil} or any other type of garbage.
 
 The only use for this I can see is what @code{nnvirtual} does with
 it---if a component group is auto-expirable, marking an article as read
 in the virtual group should result in the article being marked as
-expirable. 
+expirable.
 
 There should be no result data from this function.
 
@@ -18238,7 +18760,7 @@ There should be no result data from this function.
 @item (nnchoke-request-group-description GROUP &optional SERVER)
 
 The result data from this function should be a description of
-@var{group}. 
+@var{group}.
 
 @example
 description-line = name <TAB> description eol
@@ -18265,7 +18787,7 @@ format.  The data should be in the active buffer format.
 
 @item (nnchoke-request-create-group GROUP &optional SERVER)
 
-This function should create an empty group with name @var{group}.  
+This function should create an empty group with name @var{group}.
 
 There should be no return data.
 
@@ -18277,7 +18799,7 @@ This function should run the expiry process on all articles in the
 numbers.)  It is left up to the backend to decide how old articles
 should be before they are removed by this function.  If @var{force} is
 non-@code{nil}, all @var{articles} should be deleted, no matter how new
-they are. 
+they are.
 
 This function should return a list of articles that it did not/was not
 able to delete.
@@ -18289,7 +18811,7 @@ There should be no result data returned.
 &optional LAST)
 
 This function should move @var{article} (which is a number) from
-@var{group} by calling @var{accept-form}.  
+@var{group} by calling @var{accept-form}.
 
 This function should ready the article in question for moving by
 removing any header lines it has added to the article, and generally
@@ -18300,12 +18822,12 @@ non-@code{nil} value, the article should be removed.
 
 If @var{last} is @code{nil}, that means that there is a high likelihood
 that there will be more requests issued shortly, so that allows some
-optimizations. 
+optimizations.
 
 The function should return a cons where the @code{car} is the group name and
 the @code{cdr} is the article number that the article was entered as.
 
-There should be no data returned. 
+There should be no data returned.
 
 
 @item (nnchoke-request-accept-article GROUP &optional SERVER LAST)
@@ -18387,10 +18909,10 @@ editing articles.
 
 It would make sense if it were possible to ``inherit'' functions from
 backends when writing new backends.  And, indeed, you can do that if you
-want to.  (You don't have to if you don't want to, of course.)  
+want to.  (You don't have to if you don't want to, of course.)
 
 All the backends declare their public variables and functions by using a
-package called @code{nnoo}.  
+package called @code{nnoo}.
 
 To inherit functions from other backends (and allow other backends to
 inherit functions from the current backend), you should use the
@@ -18413,7 +18935,7 @@ both @code{nnml} and @code{nnmh}.
 @item defvoo
 This macro is equivalent to @code{defvar}, but registers the variable as
 a public server variable.  Most state-oriented variables should be
-declared with @code{defvoo} instead of @code{defvar}.  
+declared with @code{defvoo} instead of @code{defvar}.
 
 In addition to the normal @code{defvar} parameters, it takes a list of
 variables in the parent backends to map the variable to when executing
@@ -18427,7 +18949,7 @@ a function in those backends.
 
 This means that @code{nnml-current-directory} will be set to
 @code{nndir-directory} when an @code{nnml} function is called on behalf
-of @code{nndir}.  (The same with @code{nnmh}.)  
+of @code{nndir}.  (The same with @code{nnmh}.)
 
 @item nnoo-define-basics
 This macro defines some common functions that almost all backends should
@@ -18566,12 +19088,12 @@ The abilities can be:
 @item mail
 This is a mailish backend---followups should (probably) go via mail.
 @item post
-This is a newsish backend---followups should (probably) go via news. 
+This is a newsish backend---followups should (probably) go via news.
 @item post-mail
 This backend supports both mail and news.
 @item none
 This is neither a post nor mail backend---it's something completely
-different. 
+different.
 @item respool
 It supports respooling---or rather, it is able to modify its source
 articles and groups.
@@ -18581,7 +19103,7 @@ true for almost all backends.
 @item prompt-address
 The user should be prompted for an address when doing commands like
 @kbd{B} in the group buffer.  This is true for backends like
-@code{nntp}, but not @code{nnmbox}, for instance. 
+@code{nntp}, but not @code{nnmbox}, for instance.
 @end table
 
 
@@ -18591,7 +19113,7 @@ The user should be prompted for an address when doing commands like
 One of the things that separate the mail backends from the rest of the
 backends is the heavy dependence by the mail backends on common
 functions in @file{nnmail.el}.  For instance, here's the definition of
-@code{nnml-request-scan}: 
+@code{nnml-request-scan}:
 
 @lisp
 (deffoo nnml-request-scan (&optional group server)
@@ -18601,7 +19123,7 @@ functions in @file{nnmail.el}.  For instance, here's the definition of
 
 It simply calls @code{nnmail-get-new-mail} with a few parameters,
 and @code{nnmail} takes care of all the moving and splitting of the
-mail.  
+mail.
 
 This function takes four parameters.
 
@@ -18623,7 +19145,7 @@ performed for one group only.
 
 @code{nnmail-get-new-mail} will call @var{backend}@code{-save-mail} to
 save each article.  @var{backend}@code{-active-number} will be called to
-find the article number assigned to this article.  
+find the article number assigned to this article.
 
 The function also uses the following variables:
 @var{backend}@code{-get-new-mail} (to see whether to get new mail for
@@ -18641,7 +19163,7 @@ this:
 @node Score File Syntax
 @subsection Score File Syntax
 
-Score files are meant to be easily parsable, but yet extremely
+Score files are meant to be easily parseable, but yet extremely
 mallable.   It was decided that something that had the same read syntax
 as an Emacs Lisp list would fit that spec.
 
@@ -18666,28 +19188,28 @@ string-rule      = "(" quote string-header quote space *string-match ")"
 number-rule      = "(" quote number-header quote space *number-match ")"
 date-rule        = "(" quote date-header quote space *date-match ")"
 quote            = <ascii 34>
-string-header    = "subject" / "from" / "references" / "message-id" / 
+string-header    = "subject" / "from" / "references" / "message-id" /
                    "xref" / "body" / "head" / "all" / "followup"
 number-header    = "lines" / "chars"
 date-header      = "date"
-string-match     = "(" quote <string> quote [ "" / [ space score [ "" / 
+string-match     = "(" quote <string> quote [ "" / [ space score [ "" /
                    space date [ "" / [ space string-match-t ] ] ] ] ] ")"
 score            = "nil" / <integer>
 date             = "nil" / <natural number>
-string-match-t   = "nil" / "s" / "substring" / "S" / "Substring" / 
+string-match-t   = "nil" / "s" / "substring" / "S" / "Substring" /
                    "r" / "regex" / "R" / "Regex" /
                    "e" / "exact" / "E" / "Exact" /
                    "f" / "fuzzy" / "F" / "Fuzzy"
-number-match     = "(" <integer> [ "" / [ space score [ "" / 
+number-match     = "(" <integer> [ "" / [ space score [ "" /
                    space date [ "" / [ space number-match-t ] ] ] ] ] ")"
 number-match-t   = "nil" / "=" / "<" / ">" / ">=" / "<="
-date-match       = "(" quote <string> quote [ "" / [ space score [ "" / 
+date-match       = "(" quote <string> quote [ "" / [ space score [ "" /
                    space date [ "" / [ space date-match-t ] ] ] ] ")"
 date-match-t     = "nil" / "at" / "before" / "after"
 atom             = "(" [ required-atom / optional-atom ] ")"
 required-atom    = mark / expunge / mark-and-expunge / files /
                    exclude-files / read-only / touched
-optional-atom    = adapt / local / eval 
+optional-atom    = adapt / local / eval
 mark             = "mark" space nil-or-number
 nil-or-number    = "nil" / <integer>
 expunge          = "expunge" space nil-or-number
@@ -18703,7 +19225,7 @@ space            = *[ " " / <TAB> / <NEWLINE> ]
 @end example
 
 Any unrecognized elements in a score file should be ignored, but not
-discarded.  
+discarded.
 
 As you can see, white space is needed, but the type and amount of white
 space is irrelevant.  This means that formatting of the score file is
@@ -18744,7 +19266,7 @@ be put in there.
 @subsection Ranges
 
 @sc{gnus} introduced a concept that I found so useful that I've started
-using it a lot and have elaborated on it greatly. 
+using it a lot and have elaborated on it greatly.
 
 The question is simple: If you have a large amount of objects that are
 identified by numbers (say, articles, to take a @emph{wild} example)
@@ -18752,7 +19274,7 @@ that you want to qualify as being ``included'', a normal sequence isn't
 very useful.  (A 200,000 length sequence is a bit long-winded.)
 
 The solution is as simple as the question: You just collapse the
-sequence. 
+sequence.
 
 @example
 (1 2 3 4 5 6 10 11 12)
@@ -18808,7 +19330,7 @@ range handling.)
 range           = simple-range / normal-range
 simple-range    = "(" number " . " number ")"
 normal-range    = "(" start-contents ")"
-contents        = "" / simple-range *[ " " contents ] / 
+contents        = "" / simple-range *[ " " contents ] /
                   number *[ " " contents ]
 @end example
 
@@ -18817,7 +19339,7 @@ marks.  I plan on implementing a number of range operators in C if The
 Powers That Be are willing to let me.  (I haven't asked yet, because I
 need to do some more thinking on what operators I need to make life
 totally range-based without ever having to convert back to normal
-sequences.) 
+sequences.)
 
 
 @node Group Info
@@ -18836,7 +19358,7 @@ second is a more complex one:
 ("nnml:my.mail" 3 ((1 . 5) 9 (20 . 55))
                 ((tick (15 . 19)) (replied 3 6 (19 . 3)))
                 (nnml "")
-                (auto-expire (to-address "ding@@gnus.org")))
+                ((auto-expire . t) (to-address . "ding@@gnus.org")))
 @end example
 
 The first element is the @dfn{group name}---as Gnus knows the group,
@@ -18856,9 +19378,9 @@ three elements, which saves quite a lot of cons cells.
 Here's a BNF definition of the group info format:
 
 @example
-info          = "(" group space ralevel space read 
+info          = "(" group space ralevel space read
                 [ "" / [ space marks-list [ "" / [ space method [ "" /
-                space parameters ] ] ] ] ] ")" 
+                space parameters ] ] ] ] ] ")"
 group         = quote <string> quote
 ralevel       = rank / level
 level         = <integer in the range of 1 to inf>
@@ -18977,15 +19499,15 @@ A list of the current symbolic prefixes---the
 
 @item A
 The current article number---the @code{gnus-summary-article-number}
-function. 
+function.
 
 @item H
 The current article header---the @code{gnus-summary-article-header}
-function. 
+function.
 
 @item g
 The current group name---the @code{gnus-group-group-name}
-function. 
+function.
 
 @end table
 
@@ -19002,7 +19524,7 @@ like XEmacs or Mule, but because it comes first alphabetically.
 This means that Gnus will byte-compile under Emacs with nary a warning,
 while XEmacs will pump out gigabytes of warnings while byte-compiling.
 As I use byte-compilation warnings to help me root out trivial errors in
-Gnus, that's very useful.  
+Gnus, that's very useful.
 
 I've also consistently used Emacs function interfaces, but have used
 Gnusey aliases for the functions.  To take an example:  Emacs defines a
@@ -19050,7 +19572,7 @@ hit these indirections impose on Gnus under XEmacs should be slight.
 
 The active file lists all groups available on the server in
 question.  It also lists the highest and lowest current article numbers
-in each group.  
+in each group.
 
 Here's an excerpt from a typical active file:
 
@@ -19124,7 +19646,7 @@ cat instead.
 @item
 Q: What is an experienced Emacs user?
 
-@item 
+@item
 A: A person who wishes that the terminal had pedals.
 @end itemize