Update Gnus to No Gnus 0.7 from the Gnus CVS trunk

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

31 files changed, 960 insertions, 435 deletions

diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index f09451af805..585f62087d0 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -10,15 +10,16 @@ For older news, see Gnus info node "New Features".
 
 * Installation changes
 
-** Upgrading from previous (stable) version if you have used Oort.
+** Upgrading from previous (stable) version if you have used No Gnus.
 
-If you have tried Oort (the unstable Gnus branch leading to this
+If you have tried No Gnus (the unstable Gnus branch leading to this
 release) but went back to a stable version, be careful when upgrading to
-this version.  In particular, you will probably want to remove all
-`.marks' (nnml) and `.mrk' (nnfolder) files, so that flags are read from
-your `.newsrc.eld' instead of from the `.marks'/`.mrk' file where this
-release store flags.  See a later entry for more information about
-marks.  Note that downgrading isn't save in general.
+this version.  In particular, you will probably want to remove the
+`~/News/marks' directory (perhaps selectively), so that flags are read
+from your `~/.newsrc.eld' instead of from the stale marks file, where
+this release will store flags for nntp.  See a later entry for more
+information about nntp marks.  Note that downgrading isn't safe in
+general.
 
 ** Lisp files are now installed in `.../site-lisp/gnus/' by default.  It
 defaulted to `.../site-lisp/' formerly.  In addition to this, the new
@@ -26,493 +27,191 @@ installer issues a warning if other Gnus installations which will shadow
 the latest one are detected.  You can then remove those shadows manually
 or remove them using `make remove-installed-shadows'.
 
-** New `make.bat' for compiling and installing Gnus under MS Windows
-
-Use `make.bat' if you want to install Gnus under MS Windows, the first
-argument to the batch-program should be the directory where `xemacs.exe'
-respectively `emacs.exe' is located, if you want to install Gnus after
-compiling it, give `make.bat' `/copy' as the second parameter.
-
-`make.bat' has been rewritten from scratch, it now features automatic
-recognition of XEmacs and GNU Emacs, generates `gnus-load.el', checks if
-errors occur while compilation and generation of info files and reports
-them at the end of the build process.  It now uses `makeinfo' if it is
-available and falls back to `infohack.el' otherwise.  `make.bat' should
-now install all files which are necessary to run Gnus and be generally a
-complete replacement for the `configure; make; make install' cycle used
-under Unix systems.
-
-The new `make.bat' makes `make-x.bat' and `xemacs.mak' superfluous, so
-they have been removed.
-
-** `~/News/overview/' not used.
-
-As a result of the following change, the `~/News/overview/' directory is
-not used any more.  You can safely delete the entire hierarchy.
-
-** `(require 'gnus-load)'
-
-If you use a stand-alone Gnus distribution, you'd better add `(require
-'gnus-load)' into your `~/.emacs' after adding the Gnus lisp directory
-into load-path.
-
-File `gnus-load.el' contains autoload commands, functions and variables,
-some of which may not be included in distributions of Emacsen.
-
-
 
 * New packages and libraries within Gnus
 
-** The revised Gnus FAQ is included in the manual, *Note Frequently Asked
-Questions::.
-
-** TLS wrapper shipped with Gnus
+** Gnus includes the Emacs Lisp SASL library.
 
-TLS/SSL is now supported in IMAP and NNTP via `tls.el' and GNUTLS.  The
-old TLS/SSL support via (external third party) `ssl.el' and OpenSSL
-still works.
+This provides a clean API to SASL mechanisms from within Emacs.  The
+user visible aspects of this, compared to the earlier situation, include
+support for DIGEST-MD5 and NTLM.   *Note Emacs SASL: (sasl)Top.
 
-** Improved anti-spam features.
+** ManageSieve connections uses the SASL library by default.
 
-Gnus is now able to take out spam from your mail and news streams using
-a wide variety of programs and filter rules.  Among the supported
-methods are RBL blocklists, bogofilter and white/blacklists.  Hooks for
-easy use of external packages such as SpamAssassin and Hashcash are also
-new.  *Note Thwarting Email Spam::.
+The primary change this brings is support for DIGEST-MD5 and NTLM, when
+the server supports it.
 
-** Gnus supports server-side mail filtering using Sieve.
-
-Sieve rules can be added as Group Parameters for groups, and the
-complete Sieve script is generated using `D g' from the Group buffer,
-and then uploaded to the server using `C-c C-l' in the generated Sieve
-buffer.  *Note Sieve Commands::, and the new Sieve manual *Note Top:
-(sieve)Top.
-
-
-
-* Changes in group mode
-
-** `gnus-group-read-ephemeral-group' can be called interactively, using `G
-M'.
-
-** Retrieval of charters and control messages
-
-There are new commands for fetching newsgroup charters (`H c') and
-control messages (`H C').
-
-** The new variable `gnus-parameters' can be used to set group parameters.
-
-Earlier this was done only via `G p' (or `G c'), which stored the
-parameters in `~/.newsrc.eld', but via this variable you can enjoy the
-powers of customize, and simplified backups since you set the variable
-in `~/.gnus.el' instead of `~/.newsrc.eld'.  The variable maps regular
-expressions matching group names to group parameters, a'la:
-(setq gnus-parameters
- '(("mail\\..*"
-    (gnus-show-threads nil)
-    (gnus-use-scoring nil))
-   ("^nnimap:\\(foo.bar\\)$"
-    (to-group . "\\1"))))
-
-** Unread count correct in nnimap groups.
-
-The estimated number of unread articles in the group buffer should now
-be correct for nnimap groups.  This is achieved by calling
-`nnimap-fixup-unread-after-getting-new-news' from the
-`gnus-setup-news-hook' (called on startup) and
-`gnus-after-getting-new-news-hook'. (called after getting new mail).  If
-you have modified those variables from the default, you may want to add
-`nnimap-fixup-unread-after-getting-new-news' again.  If you were happy
-with the estimate and want to save some (minimal) time when getting new
-mail, remove the function.
-
-** Group names are treated as UTF-8 by default.
-
-This is supposedly what USEFOR wanted to migrate to.  See
-`gnus-group-name-charset-group-alist' and
-`gnus-group-name-charset-method-alist' for customization.
-
-** `gnus-group-charset-alist' and `gnus-group-ignored-charsets-alist'.
-
-The regexps in these variables are compared with full group names
-instead of real group names in 5.8.  Users who customize these variables
-should change those regexps accordingly.  For example:
-("^han\\>" euc-kr) -> ("\\(^\\|:\\)han\\>" euc-kr)
+** Gnus includes a password cache mechanism in password.el.
 
+It is enabled by default (see `password-cache'), with a short timeout of
+16 seconds (see `password-cache-expiry').  If PGG is used as the PGP
+back end, the PGP passphrase is managed by this mechanism.  Passwords
+for ManageSieve connections are managed by this mechanism, after
+querying the user about whether to do so.
 
 
 * Changes in summary and article mode
 
-** `F' (`gnus-article-followup-with-original') and `R'
-(`gnus-article-reply-with-original') only yank the text in the region if
-the region is active.
-
-** In draft groups, `e' is now bound to `gnus-draft-edit-message'.  Use `B
-w' for `gnus-summary-edit-article' instead.
-
-** Article Buttons
-
-More buttons for URLs, mail addresses, Message-IDs, Info links, man
-pages and Emacs or Gnus related references.  *Note Article Buttons::.
-The variables `gnus-button-*-level' can be used to control the
-appearance of all article buttons.  *Note Article Button Levels::.
-
-** Single-part yenc encoded attachments can be decoded.
-
-** Picons
-
-The picons code has been reimplemented to work in GNU Emacs--some of the
-previous options have been removed or renamed.
-
-Picons are small "personal icons" representing users, domain and
-newsgroups, which can be displayed in the Article buffer.  *Note
-Picons::.
-
-** If the new option `gnus-treat-body-boundary' is non-`nil', a boundary
-line is drawn at the end of the headers.
-
-** Signed article headers (X-PGP-Sig) can be verified with `W p'.
-
-** The Summary Buffer uses an arrow in the fringe to indicate the current
-article.  Use `(setq gnus-summary-display-arrow nil)' to disable it.
-
-** Warn about email replies to news
-
-Do you often find yourself replying to news by email by mistake?  Then
-the new option `gnus-confirm-mail-reply-to-news' is just the thing for
-you.
-
-** If the new option `gnus-summary-display-while-building' is non-`nil',
-the summary buffer is shown and updated as it's being built.
-
-** The new `recent' mark `.' indicates newly arrived messages (as opposed
-to old but unread messages).
-
-** Gnus supports RFC 2369 mailing list headers, and adds a number of
-related commands in mailing list groups.  *Note Mailing List::.
-
-** The Date header can be displayed in a format that can be read aloud in
-English.  *Note Article Date::.
-
-** diffs are automatically highlighted in groups matching
-`mm-uu-diff-groups-regexp'
-
-** Better handling of Microsoft citation styles
-
-Gnus now tries to recognize the mangled header block that some Microsoft
-mailers use to indicate that the rest of the message is a citation, even
-though it is not quoted in any way.  The variable
-`gnus-cite-unsightly-citation-regexp' matches the start of these
-citations.
-
-The new command `W Y f' (`gnus-article-outlook-deuglify-article') allows
-deuglifying broken Outlook (Express) articles.
-
-** `gnus-article-skip-boring'
-
-If you set `gnus-article-skip-boring' to `t', then Gnus will not scroll
-down to show you a page that contains only boring text, which by default
-means cited text and signature.  You can customize what is skippable
-using `gnus-article-boring-faces'.
-
-This feature is especially useful if you read many articles that consist
-of a little new content at the top with a long, untrimmed message cited
-below.
-
-** Smileys (`:-)', `;-)' etc) are now displayed graphically in Emacs too.
-
-Put `(setq gnus-treat-display-smileys nil)' in `~/.gnus.el' to disable
-it.
-
-** Face headers handling.  *Note Face::.
-
-** In the summary buffer, the new command `/ N' inserts new messages and `/
-o' inserts old messages.
-
-** Gnus decodes morse encoded messages if you press `W m'.
+** Gnus now supports sticky article buffers.  Those are article buffers
+that are not reused when you select another article.  *Note Sticky
+Articles::.
 
-** `gnus-summary-line-format'
+** International host names (IDNA) can now be decoded inside article bodies
+using `W i' (`gnus-summary-idna-message').  This requires that GNU Libidn
+(`http://www.gnu.org/software/libidn/') has been installed.
 
-The default value changed to `%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n'.
-Moreover `gnus-extra-headers', `nnmail-extra-headers' and
-`gnus-ignored-from-addresses' changed their default so that the users
-name will be replaced by the recipient's name or the group name posting
-to for NNTP groups.
+** The non-ASCII group names handling has been much improved.  The back
+ends that fully support non-ASCII group names are now `nntp', `nnml',
+and `nnrss'.  Also the agent, the cache, and the marks features work
+with those back ends.  *Note Non-ASCII Group Names::.
 
-** Deleting of attachments.
+** Gnus now displays DNS master files sent as text/dns using dns-mode.
 
-The command `gnus-mime-save-part-and-strip' (bound to `C-o' on MIME
-buttons) saves a part and replaces the part with an external one.
-`gnus-mime-delete-part' (bound to `d' on MIME buttons) removes a part.
-It works only on back ends that support editing.
+** Gnus supports new limiting commands in the Summary buffer: `/ r'
+(`gnus-summary-limit-to-replied') and `/ R'
+(`gnus-summary-limit-to-recipient').  *Note Limiting::.
 
-** `gnus-default-charset'
+** You can now fetch all ticked articles from the server using `Y t'
+(`gnus-summary-insert-ticked-articles').  *Note Summary Generation
+Commands::.
 
-The default value is determined from the `current-language-environment'
-variable, instead of `iso-8859-1'.  Also the `.*' item in
-`gnus-group-charset-alist' is removed.
+** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t'
+(`gnus-summary-sort-by-recipient').  *Note Summary Sorting::.
 
-** Printing capabilities are enhanced.
+** S/MIME now features LDAP user certificate searches.  You need to
+configure the server in `smime-ldap-host-list'.
 
-Gnus supports Muttprint natively with `O P' from the Summary and Article
-buffers.  Also, each individual MIME part can be printed using `p' on
-the MIME button.
+** URLs inside OpenPGP headers are retrieved and imported to your PGP key
+ring when you click on them.
 
-** Extended format specs.
+** Picons can be displayed right from the textual address, see
+`gnus-picon-style'.  *Note Picons::.
 
-Format spec `%&user-date;' is added into
-`gnus-summary-line-format-alist'.  Also, user defined extended format
-specs are supported.  The extended format specs look like `%u&foo;',
-which invokes function `gnus-user-format-function-FOO'.  Because `&' is
-used as the escape character, old user defined format `%u&' is no longer
-supported.
+** ANSI SGR control sequences can be transformed using `W A'.
 
-** `/ *' (`gnus-summary-limit-include-cached') is rewritten.
+ANSI sequences are used in some Chinese hierarchies for highlighting
+articles (`gnus-article-treat-ansi-sequences').
 
-It was aliased to `Y c' (`gnus-summary-insert-cached-articles').  The
-new function filters out other articles.
+** Gnus now MIME decodes articles even when they lack "MIME-Version" header.
+This changes the default of `gnus-article-loose-mime'.
 
-** Some limiting commands accept a `C-u' prefix to negate the match.
+** `gnus-decay-scores' can be a regexp matching score files.  For example,
+set it to `\\.ADAPT\\'' and only adaptive score files will be decayed.
+ *Note Score Decays::.
 
-If `C-u' is used on subject, author or extra headers, i.e., `/ s', `/
-a', and `/ x' (`gnus-summary-limit-to-{subject,author,extra}')
-respectively, the result will be to display all articles that do not
-match the expression.
+** Strings prefixing to the `To' and `Newsgroup' headers in summary lines
+when using `gnus-ignored-from-addresses' can be customized with
+`gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'.  *Note To
+From Newsgroups::.
 
-** Gnus inlines external parts (message/external).
-
-
-
-* Changes in Message mode and related Gnus features
-
-** Delayed articles
-
-You can delay the sending of a message with `C-c C-j' in the Message
-buffer.  The messages are delivered at specified time.  This is useful
-for sending yourself reminders.  *Note Delayed Articles::.
-
-** If the new option `nnml-use-compressed-files' is non-`nil', the nnml
-back end allows compressed message files.
-
-** The new option `gnus-gcc-mark-as-read' automatically marks Gcc articles
-as read.
-
-** Externalizing of attachments
-
-If `gnus-gcc-externalize-attachments' or
-`message-fcc-externalize-attachments' is non-`nil', attach local files
-as external parts.
-
-** The envelope sender address can be customized when using Sendmail.
- *Note Mail Variables: (message)Mail Variables.
-
-** Gnus no longer generate the Sender: header automatically.
-
-Earlier it was generated when the user configurable email address was
-different from the Gnus guessed default user address.  As the guessing
-algorithm is rarely correct these days, and (more controversially) the
-only use of the Sender: header was to check if you are entitled to
-cancel/supersede news (which is now solved by Cancel Locks instead, see
-another entry), generation of the header has been disabled by default.
-See the variables `message-required-headers',
-`message-required-news-headers', and `message-required-mail-headers'.
-
-** Features from third party `message-utils.el' added to `message.el'.
-
-Message now asks if you wish to remove `(was: <old subject>)' from
-subject lines (see `message-subject-trailing-was-query').  `C-c M-m' and
-`C-c M-f' inserts markers indicating included text.  `C-c C-f a' adds a
-X-No-Archive: header.  `C-c C-f x' inserts appropriate headers and a
-note in the body for cross-postings and followups (see the variables
-`message-cross-post-*').
-
-** References and X-Draft-From headers are no longer generated when you
-start composing messages and `message-generate-headers-first' is `nil'.
-
-** Easy inclusion of X-Faces headers.  *Note X-Face::.
-
-** Group Carbon Copy (GCC) quoting
-
-To support groups that contains SPC and other weird characters, groups
-are quoted before they are placed in the Gcc: header.  This means
-variables such as `gnus-message-archive-group' should no longer contain
-quote characters to make groups containing SPC work.  Also, if you are
-using the string `nnml:foo, nnml:bar' (indicating Gcc into two groups)
-you must change it to return the list `("nnml:foo" "nnml:bar")',
-otherwise the Gcc: line will be quoted incorrectly.  Note that returning
-the string `nnml:foo, nnml:bar' was incorrect earlier, it just didn't
-generate any problems since it was inserted directly.
-
-** `message-insinuate-rmail'
-
-Adding `(message-insinuate-rmail)' and `(setq mail-user-agent
-'gnus-user-agent)' in `.emacs' convinces Rmail to compose, reply and
-forward messages in message-mode, where you can enjoy the power of MML.
-
-** `message-minibuffer-local-map'
-
-The line below enables BBDB in resending a message:
-(define-key message-minibuffer-local-map [(tab)]
-  'bbdb-complete-name)
-
-** `gnus-posting-styles'
-
-Add a new format of match like
-((header "to" "larsi.*org")
- (Organization "Somewhere, Inc."))
-The old format like the lines below is obsolete, but still accepted.
-(header "to" "larsi.*org"
-   (Organization "Somewhere, Inc."))
-
-** `message-ignored-news-headers' and `message-ignored-mail-headers'
-
-`X-Draft-From' and `X-Gnus-Agent-Meta-Information' have been added into
-these two variables.  If you customized those, perhaps you need add
-those two headers too.
-
-** Gnus supports the "format=flowed" (RFC 2646) parameter.  On composing
-messages, it is enabled by `use-hard-newlines'.  Decoding format=flowed
-was present but not documented in earlier versions.
+** You can replace MIME parts with external bodies.  See
+`gnus-mime-replace-part' and `gnus-article-replace-part'.  *Note MIME
+Commands::, *note Using MIME::.
 
 ** The option `mm-fill-flowed' can be used to disable treatment of
-"format=flowed" messages.  Also, flowed text is disabled when sending
-inline PGP signed messages.  (New in Gnus 5.10.7)
+format=flowed messages.  Also, flowed text is disabled when sending
+inline PGP signed messages.  *Note Flowed text: (emacs-mime)Flowed text.
+(New in Gnus 5.10.7)
 
-** Gnus supports the generation of RFC 2298 Disposition Notification
-requests.
 
-This is invoked with the `C-c M-n' key binding from message mode.
-
-** Message supports the Importance: (RFC 2156) header.
-
-In the message buffer, `C-c C-f C-i' or `C-c C-u' cycles through the
-valid values.
-
-** Gnus supports Cancel Locks in News.
-
-This means a header `Cancel-Lock' is inserted in news posting.  It is
-used to determine if you wrote an article or not (for canceling and
-superseding).  Gnus generates a random password string the first time
-you post a message, and saves it in your `~/.emacs' using the Custom
-system.  While the variable is called `canlock-password', it is not
-security sensitive data.  Publishing your canlock string on the web will
-not allow anyone to be able to anything she could not already do.  The
-behavior can be changed by customizing `message-insert-canlock'.
+
+* Changes in Message mode
 
-** Gnus supports PGP (RFC 1991/2440), PGP/MIME (RFC 2015/3156) and S/MIME
-(RFC 2630-2633).
+** Gnus now supports the "hashcash" client puzzle anti-spam mechanism.  Use
+`(setq message-generate-hashcash t)' to enable.  *Note Hashcash::.
 
-It needs an external S/MIME and OpenPGP implementation, but no
-additional Lisp libraries.  This add several menu items to the
-Attachments menu, and `C-c RET' key bindings, when composing messages.
-This also obsoletes `gnus-article-hide-pgp-hook'.
+** You can now drag and drop attachments to the Message buffer.  See
+`mml-dnd-protocol-alist' and `mml-dnd-attach-options'.  *Note MIME:
+(message)MIME.
 
-** MML (Mime compose) prefix changed from `M-m' to `C-c C-m'.
+** The option `message-yank-empty-prefix' now controls how empty lines are
+prefixed in cited text.  *Note Insertion Variables: (message)Insertion
+Variables.
 
-This change was made to avoid conflict with the standard binding of
-`back-to-indentation', which is also useful in message mode.
+** Gnus uses narrowing to hide headers in Message buffers.  The
+`References' header is hidden by default.  To make all headers visible,
+use `(setq message-hidden-headers nil)'.  *Note Message Headers:
+(message)Message Headers.
 
-** The default for `message-forward-show-mml' changed to the symbol `best'.
+** You can highlight different levels of citations like in the article
+buffer.  See `gnus-message-highlight-citation'.
 
-The behavior for the `best' value is to show MML (i.e., convert to MIME)
-when appropriate.  MML will not be used when forwarding signed or
-encrypted messages, as the conversion invalidate the digital signature.
+** `auto-fill-mode' is enabled by default in Message mode.  See
+`message-fill-column'.  *Note Message Headers: (message)Various Message
+Variables.
 
-** If `auto-compression-mode' is enabled, attachments are automatically
-decompressed when activated.
+** You can now store signature files in a special directory named
+`message-signature-directory'.
 
-** Support for non-ASCII domain names
+** The option `message-citation-line-format' controls the format of the
+"Whomever writes:" line.  You need to set
+`message-citation-line-function' to
+`message-insert-formated-citation-line' as well.
 
-Message supports non-ASCII domain names in From:, To: and Cc: and will
-query you whether to perform encoding when you try to send a message.
-The variable `message-use-idna' controls this.  Gnus will also decode
-non-ASCII domain names in From:, To: and Cc: when you view a message.
-The variable `gnus-use-idna' controls this.
+
+* Changes in back ends
 
-** You can now drag and drop attachments to the Message buffer.  See
-`mml-dnd-protocol-alist' and `mml-dnd-attach-options'.  *Note MIME:
-(message)MIME.
+** The nntp back end stores article marks in `~/News/marks'.
 
+The directory can be changed using the (customizable) variable
+`nntp-marks-directory', and marks can be disabled using the (back end)
+variable `nntp-marks-is-evil'.  The advantage of this is that you can
+copy `~/News/marks' (using rsync, scp or whatever) to another Gnus
+installation, and it will realize what articles you have read and
+marked.  The data in `~/News/marks' has priority over the same data in
+`~/.newsrc.eld'.
 
-
-* Changes in back ends
+** You can import and export your RSS subscriptions from OPML files.  *Note
+RSS::.
 
-** Gnus can display RSS newsfeeds as a newsgroup.  *Note RSS::.
+** IMAP identity (RFC 2971) is supported.
 
-** The nndoc back end now supports mailman digests and exim bounces.
+By default, Gnus does not send any information about itself, but you can
+customize it using the variable `nnimap-id'.
 
-** Gnus supports Maildir groups.
+** The `nnrss' back end now supports multilingual text.  Non-ASCII group
+names for the `nnrss' groups are also supported.  *Note RSS::.
 
-Gnus includes a new back end `nnmaildir.el'.  *Note Maildir::.
+** Retrieving mail with POP3 is supported over SSL/TLS and with StartTLS.
 
-** The nnml and nnfolder back ends store marks for each groups.
+** The nnml back end allows other compression programs beside `gzip' for
+compressed message files.  *Note Mail Spool::.
 
-This makes it possible to take backup of nnml/nnfolder servers/groups
-separately of `~/.newsrc.eld', while preserving marks.  It also makes it
-possible to share articles and marks between users (without sharing the
-`~/.newsrc.eld' file) within e.g. a department.  It works by storing the
-marks stored in `~/.newsrc.eld' in a per-group file `.marks' (for nnml)
-and `GROUPNAME.mrk' (for nnfolder, named GROUPNAME).  If the
-nnml/nnfolder is moved to another machine, Gnus will automatically use
-the `.marks' or `.mrk' file instead of the information in
-`~/.newsrc.eld'.  The new server variables `nnml-marks-is-evil' and
-`nnfolder-marks-is-evil' can be used to disable this feature.
+** The nnml back end supports group compaction.
 
+This feature, accessible via the functions `gnus-group-compact-group'
+(`G z' in the group buffer) and `gnus-server-compact-server' (`z' in the
+server buffer) renumbers all articles in a group, starting from 1 and
+removing gaps.  As a consequence, you get a correct total article count
+(until messages are deleted again).
 
 
 * Appearance
 
-** The menu bar item (in Group and Summary buffer) named "Misc" has been
-renamed to "Gnus".
-
-** The menu bar item (in Message mode) named "MML" has been renamed to
-"Attachments".  Note that this menu also contains security related
-stuff, like signing and encryption (*note Security: (message)Security.).
-
-** The tool bars have been updated to use GNOME icons in Group, Summary and
-Message mode.  You can also customize the tool bars.  This is a new
-feature in Gnus 5.10.9.  (Only for Emacs, not in XEmacs.)
+** The tool bar has been updated to use GNOME icons.  You can also
+customize the tool bar.  There's no documentation in the manual yet, but
+`M-x customize-apropos RET -tool-bar$' should get you started.  (Only
+for Emacs, not in XEmacs.)
 
 ** The tool bar icons are now (de)activated correctly in the group buffer,
 see the variable `gnus-group-update-tool-bar'.  Its default value
-depends on your Emacs version.  This is a new feature in Gnus 5.10.9.
-
-
-* Miscellaneous changes
+depends on your Emacs version.
 
-** `gnus-agent'
+** You can change the location of XEmacs' toolbars in Gnus buffers.  See
+`gnus-use-toolbar' and `message-use-toolbar'.
 
-The Gnus Agent has seen a major updated and is now enabled by default,
-and all nntp and nnimap servers from `gnus-select-method' and
-`gnus-secondary-select-method' are agentized by default.  Earlier only
-the server in `gnus-select-method' was agentized by the default, and the
-agent was disabled by default.  When the agent is enabled, headers are
-now also retrieved from the Agent cache instead of the back ends when
-possible.  Earlier this only happened in the unplugged state.  You can
-enroll or remove servers with `J a' and `J r' in the server buffer.
-Gnus will not download articles into the Agent cache, unless you
-instruct it to do so, though, by using `J u' or `J s' from the Group
-buffer.  You revert to the old behavior of having the Agent disabled
-with `(setq gnus-agent nil)'.  Note that putting `(gnus-agentize)' in
-`~/.gnus.el' is not needed any more.
 
-** Gnus reads the NOV and articles in the Agent if plugged.
-
-If one reads an article while plugged, and the article already exists in
-the Agent, it won't get downloaded once more.  `(setq gnus-agent-cache
-nil)' reverts to the old behavior.
-
-** Dired integration
-
-`gnus-dired-minor-mode' (see *Note Other modes::) installs key bindings
-in dired buffers to send a file as an attachment, open a file using the
-appropriate mailcap entry, and print a file using the mailcap entry.
-
-** The format spec `%C' for positioning point has changed to `%*'.
+
+* Miscellaneous changes
 
-** `gnus-slave-unplugged'
+** Having edited the select-method for the foreign server in the server
+buffer is immediately reflected to the subscription of the groups which
+use the server in question.  For instance, if you change
+`nntp-via-address' into `bar.example.com' from `foo.example.com', Gnus
+will connect to the news host by way of the intermediate host
+`bar.example.com' from next time.
 
-A new command which starts Gnus offline in slave mode.
+** The `all.SCORE' file can be edited from the group buffer using `W e'.
 
 
 
diff --git a/etc/gnus/gnus-setup.ast b/etc/gnus/gnus-setup.ast
new file mode 100644
index 00000000000..2893c40b245
--- /dev/null
+++ b/etc/gnus/gnus-setup.ast
@@ -0,0 +1,51 @@
+@title Configuring Gnus for the first time
+
+@node What do you want to do with Gnus?
+
+@variable outbound (:radio ((item :tag "Send mail via sendmail" "sendmail") (item :tag "Send mail via SMTP" "smtp"))) "sendmail"
+
+@variable backends (:set ((item :tag "Read news via NNTP" "nntp") (item :tag "Read mail, store it locally" "nnml") (item :tag "Read mail and store it on an IMAP server" "nnimap"))) (list "nnml")
+@result primary-mail-selections (list backends outbound)
+
+@text
+Welcome to Gnus.  You need to tell us what you want to do with Gnus
+before we go on to specific configurations.
+
+Choose the tasks you want to set up: 
+@variable{backends}
+
+Choose the method Gnus will use to send mail: 
+@variable{outbound}
+
+@end text
+
+@next (member "nnml" backends) "Setting up local mail storage (nnml)"
+@next (member "nntp" backends) "Setting up a NNTP server"
+
+@node Setting up local mail storage (nnml)
+@variable mechanism (:radio ((item :tag "Get mail from your Unix mbox" "mbox") (item :tag "Use POP3 to retrieve mail" "pop3"))) "mbox"
+@result nnml-mechanism (list mechanism)
+@text
+You are setting up local mail storage, using the nnml backend in Gnus terms.
+
+Your mail can be downloaded into Gnus in several ways, choose one:
+@variable{mechanism}
+
+@end text
+
+@node Setting up a NNTP server
+
+@text
+TODO: this will be a real link.
+Run M-x assistant and use the news-server.ast file as input.
+@end text
+
+
+@c Local variables:
+@c mode: texinfo
+@c End:
+
+@ignore
+   arch-tag: 6b7b200b-9169-4b44-8b32-b73773fa71af
+@end ignore
+
diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast
new file mode 100644
index 00000000000..294f92382d9
--- /dev/null
+++ b/etc/gnus/news-server.ast
@@ -0,0 +1,64 @@
+@title Configuring Gnus for reading news
+
+
+@node Setting up the news server name and port number
+@variable server :string (gnus-getenv-nntpserver)
+@variable port :number 119
+@validate (assistant-validate-connect-to-server server port)
+@result gnus-select-method (list 'nntp server (list 'nntp-server port))
+@text
+Usenet news is usually read from your Internet service prodider's news
+server.  If you don't know the name of this server, contact your ISP.
+
+As a guess, the name of the server might be news.yourisp.com.
+
+Server name: @variable{server}
+Port number: @variable{port}
+@end text
+@next t "User name and password"
+
+
+@node User name and password
+@type interstitial
+@next 
+(if (assistant-password-required-p)
+    "Enter user name and password"
+  "Want user name and password?")
+@end next
+
+
+@node Want user name and password?
+@variable passwordp (:radio ((item "Yes") (item "No"))) "No"
+@text
+Some news servers require that you enter a user name and a password.
+It doesn't look like your news server is one of them.
+
+Do you want to enter user name and password anyway?
+
+@variable{passwordp}
+
+@end text
+
+@next (equal passwordp "No") finish
+@next (not (equal passwordp "No")) "Enter user name and password"
+
+
+@node Enter user name and password
+@variable user-name :string (user-login-name)
+@variable password :password (or (assistant-authinfo-data server port 'password) "")
+@text
+
+It looks like your news server requires you to enter a user name
+and a password:
+
+User name: @variable{user-name}
+Password: @variable{user-name}
+
+@end text
+
+@c Local variables:
+@c mode: texinfo
+@c End:
+
+@c arch tag is missing
+
diff --git a/etc/images/gnus/mail_send.xpm b/etc/images/gnus/mail_send.xpm
new file mode 100644
index 00000000000..f1d2282ec8a
--- /dev/null
+++ b/etc/images/gnus/mail_send.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"24 24 9 1",
+"  c Gray0",
+". c #675e6580613e",
+"X c #8c8c7c7c6969",
+"o c #9b458d377822",
+"O c #a941a6459f3e",
+"+ c #c8c8b2b29898",
+"@ c #dadac2c2a5a5",
+"# c #eb4dea2fe4ad",
+"$ c None",
+/* pixels */
+"$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$    $$$$$$$",
+"$$$$$$$$     .@#+ $$$$$$",
+"$$$     .+#####@O $$$$$$",
+"$$ .+##########.+O $$$$$",
+"$$ @..########O.+# $$$$$",
+"$$ O@O..@#####.+## $$$$$",
+"$$$ ###+O.O##...##O $$$$",
+"$$$ @####@+..O#O.+# $$$$",
+"$$$ O####.#######.O $$$$",
+"$$$$ ###+O########.O $$$",
+"$$$$ ###.########@O  $$$",
+"$$$$ +#+O#####@O   $$$$$",
+"$$$$$ #.###@O     $$$$$$",
+"$$$$$ .O@O   $$ .. $$$$$",
+"$$$$$ ..  $$$$ .oo. $$$$",
+"$$$$$$  $$$$$   oo   $$$",
+"$$$$$$$$$$$$$$$ Oo $$$$$",
+"$$$$$$$$$$$$$$ oOOX $$$$",
+"$$$$$$$$$$$$$$ ++++ $$$$",
+"$$$$$$$$$$$$$ O@@@@O $$$",
+"$$$$$$$$$$$$$        $$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$"
+};
diff --git a/etc/images/smilies/grayscale/blink.xpm b/etc/images/smilies/grayscale/blink.xpm
new file mode 100644
index 00000000000..eec7209f38b
--- /dev/null
+++ b/etc/images/smilies/grayscale/blink.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * blink_xpm[] = {
+"14 14 7 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #6E6E6E",
+"#      c #515151",
+"$      c #ABABAB",
+"%      c #737373",
+"              ",
+"              ",
+"         .    ",
+"         +    ",
+"  @#$$#  +    ",
+"    ++   +    ",
+"              ",
+"  +        +  ",
+"  $+      +$  ",
+"   %+    +%   ",
+"    %++++%    ",
+"     $$$$     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/braindamaged.xpm b/etc/images/smilies/grayscale/braindamaged.xpm
new file mode 100644
index 00000000000..cd47b32824a
--- /dev/null
+++ b/etc/images/smilies/grayscale/braindamaged.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * braindamaged_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #ABABAB",
+"+      c #000000",
+"@      c #515151",
+"#      c #171717",
+"$      c #737373",
+"              ",
+"              ",
+"   .++..++.   ",
+"   +@.++.@+   ",
+"   +.@#@@.+   ",
+"   +@.#@.@+   ",
+"   .++. ++.   ",
+"  +        +  ",
+"  .+      +.  ",
+"   $+    +$   ",
+"    $++++$    ",
+"     ....     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/cry.xpm b/etc/images/smilies/grayscale/cry.xpm
new file mode 100644
index 00000000000..78bf6662d6b
--- /dev/null
+++ b/etc/images/smilies/grayscale/cry.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * cry_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #ABABAB",
+"#      c #515151",
+"$      c #6E6E6E",
+"              ",
+"              ",
+"         .    ",
+"    ..  .+.   ",
+"   +++. +.+   ",
+"        +@+   ",
+"        @+#   ",
+"      @@      ",
+"    $++++$    ",
+"   .+@  @+.   ",
+"  @+@    @+@  ",
+"   @      @   ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/dead.xpm b/etc/images/smilies/grayscale/dead.xpm
new file mode 100644
index 00000000000..9be9883c077
--- /dev/null
+++ b/etc/images/smilies/grayscale/dead.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * dead_xpm[] = {
+"14 14 4 1",
+"       c None",
+".      c #737373",
+"+      c #ABABAB",
+"@      c #000000",
+"              ",
+"              ",
+"  .+ +. + +.  ",
+"  +@+@++@+@+  ",
+"   +@    @+   ",
+"  +@+@  @+@+  ",
+"   + +. + +   ",
+"              ",
+"  +@      @+  ",
+"   .@    @.   ",
+"    .@@@@.    ",
+"     ++++     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/evil.xpm b/etc/images/smilies/grayscale/evil.xpm
new file mode 100644
index 00000000000..e358cf89454
--- /dev/null
+++ b/etc/images/smilies/grayscale/evil.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * evil_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #6E6E6E",
+"+      c #484848",
+"@      c #ABABAB",
+"#      c #000000",
+"$      c #737373",
+"              ",
+"              ",
+"   .+    +.   ",
+"   @#    #@   ",
+"    #+ @+#    ",
+"    #+ @+#    ",
+"              ",
+"  #        #  ",
+"  @#      #@  ",
+"   $#    #$   ",
+"    $####$    ",
+"     @@@@     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/forced.xpm b/etc/images/smilies/grayscale/forced.xpm
new file mode 100644
index 00000000000..095084569c4
--- /dev/null
+++ b/etc/images/smilies/grayscale/forced.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * forced_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #6E6E6E",
+"#      c #ABABAB",
+"$      c #171717",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+"  @        @  ",
+"  +#      #+  ",
+"  @@#    #@@  ",
+"  #$++++++$#  ",
+"   ########   ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/frown.xpm b/etc/images/smilies/grayscale/frown.xpm
new file mode 100644
index 00000000000..b513f4c92fd
--- /dev/null
+++ b/etc/images/smilies/grayscale/frown.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * frown_xpm[] = {
+"14 14 5 1",
+"       c None",
+".      c #6E6E6E",
+"+      c #484848",
+"@      c #ABABAB",
+"#      c #000000",
+"              ",
+"              ",
+"   .+    +.   ",
+"   @#    #@   ",
+"    #+ @+#    ",
+"    #+@@+#    ",
+"              ",
+"      @@      ",
+"    .####.    ",
+"   +#@  @#+   ",
+"  @#@    @#@  ",
+"   +      +   ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/grin.xpm b/etc/images/smilies/grayscale/grin.xpm
new file mode 100644
index 00000000000..f6e45882a46
--- /dev/null
+++ b/etc/images/smilies/grayscale/grin.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * grin_xpm[] = {
+"14 14 8 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #515151",
+"#      c #6E6E6E",
+"$      c #ABABAB",
+"%      c #FFFFFF",
+"&      c #737373",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+"  ++@@##@@++  ",
+"  $+%%%%%%+$  ",
+"   &+%%%%+&   ",
+"    &++++&    ",
+"     $$$$     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/indifferent.xpm b/etc/images/smilies/grayscale/indifferent.xpm
new file mode 100644
index 00000000000..1e4f69e0f4f
--- /dev/null
+++ b/etc/images/smilies/grayscale/indifferent.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * indifferent_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #515151",
+"#      c #ABABAB",
+"$      c #6E6E6E",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+" @         #@ ",
+"#+$+$   $  +  ",
+"$ +#+$#++$+$  ",
+"  $  ++# ++   ",
+"      +       ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/reverse-smile.xpm b/etc/images/smilies/grayscale/reverse-smile.xpm
new file mode 100644
index 00000000000..a62eab0481c
--- /dev/null
+++ b/etc/images/smilies/grayscale/reverse-smile.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * reverse_smile_xpm[] = {
+"14 14 5 1",
+"       c None",
+".      c #ABABAB",
+"+      c #737373",
+"@      c #000000",
+"#      c #484848",
+"              ",
+"              ",
+"     ....     ",
+"    +@@@@+    ",
+"   +@    @+   ",
+"  .@      @.  ",
+"  @        @  ",
+"              ",
+"    @    @    ",
+"    @    @    ",
+"    @    @    ",
+"    #    #    ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/sad.xpm b/etc/images/smilies/grayscale/sad.xpm
new file mode 100644
index 00000000000..3addb6b6b5a
--- /dev/null
+++ b/etc/images/smilies/grayscale/sad.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * sad_xpm[] = {
+"14 14 5 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #ABABAB",
+"#      c #6E6E6E",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+"     @@@@     ",
+"    #++++#    ",
+"   .+@  @+.   ",
+"  @+@    @+@  ",
+"   .      .   ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/smile.xpm b/etc/images/smilies/grayscale/smile.xpm
new file mode 100644
index 00000000000..463785e6d4c
--- /dev/null
+++ b/etc/images/smilies/grayscale/smile.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * smile_xpm[] = {
+"14 14 5 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #ABABAB",
+"#      c #737373",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+"  +        +  ",
+"  @+      +@  ",
+"   #+    +#   ",
+"    #++++#    ",
+"     @@@@     ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/grayscale/wry.xpm b/etc/images/smilies/grayscale/wry.xpm
new file mode 100644
index 00000000000..79e29792ef0
--- /dev/null
+++ b/etc/images/smilies/grayscale/wry.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * wry_xpm[] = {
+"14 14 6 1",
+"       c None",
+".      c #484848",
+"+      c #000000",
+"@      c #515151",
+"#      c #ABABAB",
+"$      c #6E6E6E",
+"              ",
+"              ",
+"    .    .    ",
+"    +    +    ",
+"    +    +    ",
+"    +    +    ",
+"              ",
+"          @   ",
+"    ##   $@   ",
+"   #++++++#   ",
+"   @$   ##    ",
+"   @          ",
+"              ",
+"              "};
diff --git a/etc/images/smilies/medium/blink.xpm b/etc/images/smilies/medium/blink.xpm
new file mode 100644
index 00000000000..9bd48f7874b
--- /dev/null
+++ b/etc/images/smilies/medium/blink.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * blink_xpm[] = {
+"16 16 10 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"=      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&&&&&&*&&%. ",
+" +$&&&&&&&.&&$+ ",
+".@&@%##%&&.&&&@.",
+".#&&&..&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&.&&&&&&&&.&$.",
+".#&#.&&&&&&.#&#.",
+".@&&=.&&&&.=&&@.",
+" +$&&=....=&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/braindamaged.xpm b/etc/images/smilies/medium/braindamaged.xpm
new file mode 100644
index 00000000000..e42259de920
--- /dev/null
+++ b/etc/images/smilies/medium/braindamaged.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * braindamaged_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&#..##..#&%. ",
+" +$&.%#..#%.&$+ ",
+".@&&.#%+%%#.&&@.",
+".#&&.%#+%#%.&&#.",
+".$&&#..#&..#&&$.",
+".$&.&&&&&&&&.&$.",
+".#&#.&&&&&&.#&#.",
+".@&&*.&&&&.*&&@.",
+" +$&&*....*&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/cry.xpm b/etc/images/smilies/medium/cry.xpm
new file mode 100644
index 00000000000..e7358ad11f2
--- /dev/null
+++ b/etc/images/smilies/medium/cry.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * cry_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&&&&&&*&&%. ",
+" +$&&**&&*.*&$+ ",
+".@&&...*&.*.&&@.",
+".#&&&&&&&.#.&&#.",
+".$&&&&&&&#.%&&$.",
+".$&&&&&&&&&&&&$.",
+".#&&&@....@&&&#.",
+".@&&*.#&&#.*&&@.",
+" +$#.#&&&&#.#$+ ",
+" .%&*&&&&&&*&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/dead.xpm b/etc/images/smilies/medium/dead.xpm
new file mode 100644
index 00000000000..1d8fe12d2fa
--- /dev/null
+++ b/etc/images/smilies/medium/dead.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * dead_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%*#&#*$#&#*%. ",
+" +$#.#.##.#.#$+ ",
+".@&&#.$&&$.#&&@.",
+".#&#.#.$$.#.#&#.",
+".$&*#&#*$#&#*&$.",
+".$&.&&&&&&&&.&$.",
+".#&#.&&&&&&.#&#.",
+".@&&*.&&&&.*&&@.",
+" +$&&*....*&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/evil.xpm b/etc/images/smilies/medium/evil.xpm
new file mode 100644
index 00000000000..b7a18f8cd62
--- /dev/null
+++ b/etc/images/smilies/medium/evil.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * evil_xpm[] = {
+"16 16 10 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"=      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&@*&&&&*@&%. ",
+" +$&#.&&&&.#&$+ ",
+".@&&&.*&#*.&&&@.",
+".#&&&.*##*.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&.&&&&&&&&.&$.",
+".#&#.&&&&&&.#&#.",
+".@&&=.&&&&.=&&@.",
+" +$&&=....=&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/forced.xpm b/etc/images/smilies/medium/forced.xpm
new file mode 100644
index 00000000000..df52a7eb862
--- /dev/null
+++ b/etc/images/smilies/medium/forced.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * forced_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&@&&&&&&&&@&$.",
+".#&.#&&&&&&#.&#.",
+".@&@@#&&&&#@@&@.",
+" +$#+......+#$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/frown.xpm b/etc/images/smilies/medium/frown.xpm
new file mode 100644
index 00000000000..e4573ed5a37
--- /dev/null
+++ b/etc/images/smilies/medium/frown.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * frown_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&@*&&&&*@&%. ",
+" +$&#.&&&&.#&$+ ",
+".@&&&.*&#*.&&&@.",
+".#&&&.*##*.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&&&&&&&&&&&&$.",
+".#&&&@....@&&&#.",
+".@&&*.#&&#.*&&@.",
+" +$#.#&&&&#.#$+ ",
+" .%&*&&&&&&*&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/grin.xpm b/etc/images/smilies/medium/grin.xpm
new file mode 100644
index 00000000000..d8db415a14f
--- /dev/null
+++ b/etc/images/smilies/medium/grin.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * grin_xpm[] = {
+"16 16 11 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"=      c #FFFFFF",
+"-      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&..%%@@%%..&$.",
+".#&#.======.#&#.",
+".@&&-.====.-&&@.",
+" +$&&-....-&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/indifferent.xpm b/etc/images/smilies/medium/indifferent.xpm
new file mode 100644
index 00000000000..98519c3bdd2
--- /dev/null
+++ b/etc/images/smilies/medium/indifferent.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * indifferent_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$%&&&&&&&&&#%$.",
+".#.@.@&&&@&&.&#.",
+".@&.#.@#..@.@&@.",
+" +$@&&..#&..&$+ ",
+" .%&&&&.&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/reverse-smile.xpm b/etc/images/smilies/medium/reverse-smile.xpm
new file mode 100644
index 00000000000..9641c333033
--- /dev/null
+++ b/etc/images/smilies/medium/reverse-smile.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * reverse_smile_xpm[] = {
+"16 16 10 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #8F7B00",
+"=      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&&&&&&&&&%. ",
+" +$&&*....*&&$+ ",
+".@&&*.&&&&.*&&@.",
+".#&#.&&&&&&.#&#.",
+".$&.&&&&&&&&.&$.",
+".$&&&&&&&&&&&&$.",
+".#&&&.&&&&.&&&#.",
+".@&&&.&&&&.&&&@.",
+" +$&&.&&&&.&&$+ ",
+" .%&&=&&&&=&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/sad.xpm b/etc/images/smilies/medium/sad.xpm
new file mode 100644
index 00000000000..bc635c12dbe
--- /dev/null
+++ b/etc/images/smilies/medium/sad.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * sad_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&&&&&&&&&&&&$.",
+".#&&&@....@&&&#.",
+".@&&*.#&&#.*&&@.",
+" +$#.#&&&&#.#$+ ",
+" .%&*&&&&&&*&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/smile.xpm b/etc/images/smilies/medium/smile.xpm
new file mode 100644
index 00000000000..b08129b8ed0
--- /dev/null
+++ b/etc/images/smilies/medium/smile.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * smile_xpm[] = {
+"16 16 10 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"=      c #8F7B00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&.&&&&&&&&.&$.",
+".#&#.&&&&&&.#&#.",
+".@&&=.&&&&.=&&@.",
+" +$&&=....=&&$+ ",
+" .%&&&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/images/smilies/medium/wry.xpm b/etc/images/smilies/medium/wry.xpm
new file mode 100644
index 00000000000..3bc841b49ce
--- /dev/null
+++ b/etc/images/smilies/medium/wry.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * wry_xpm[] = {
+"16 16 9 1",
+"       c None",
+".      c #000000",
+"+      c #1D1900",
+"@      c #887500",
+"#      c #D3B600",
+"$      c #FAD800",
+"%      c #645600",
+"&      c #FFDD00",
+"*      c #594D00",
+"     ......     ",
+"   .+@#$$#@+.   ",
+"  .%$&&&&&&$%.  ",
+" .%&&*&&&&*&&%. ",
+" +$&&.&&&&.&&$+ ",
+".@&&&.&&&&.&&&@.",
+".#&&&.&&&&.&&&#.",
+".$&&&&&&&&&&&&$.",
+".$&&&&&&&&&%&&$.",
+".#&&&&&&&&@%&&#.",
+".@&&#......#&&@.",
+" +$&%@&&&&&&&$+ ",
+" .%&%&&&&&&&&%. ",
+"  .%$&&&&&&$%.  ",
+"   .+@#$$#@+.   ",
+"     ......     "};
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 4bd03ad4f77..3f6ecabd33e 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -121,7 +121,12 @@
 \newcommand{\Copyright}{%
   \begin{center}
     Copyright \copyright\ 1995, 2000, 2002, 2003, 2004,
-       2005, 2006, 2007  Free Software Foundation, Inc.
+       2005, 2006, 2007  Free Software Foundation, Inc.\\*
+    Copyright \copyright\ 2001, 2002, 2003, 2004, 2005 \author.\\*
+    Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne
+    Ingebrigtsen.\\*
+    and the Emacs Help Bindings feature (C-h b).\\*
+    Gnus logo copyright \copyright\ 1995 Luis Fernandes.\\*
   \end{center}
 
   Permission is granted to make and distribute copies of this reference
@@ -566,7 +571,7 @@
     {\esamepage
       \begin{keys}{C-c C-s C-a}
         C-c C-s C-a & Sort the summary-buffer by {\bf author}.\\
-        % C-c C-s C-t & Sort the summary-buffer by {\bf recipient}.\\ % No Gnus
+        C-c C-s C-t & Sort the summary-buffer by {\bf recipient}.\\
         C-c C-s C-d & Sort the summary-buffer by {\bf date}.\\
         C-c C-s C-i & Sort the summary-buffer by article score.\\
         C-c C-s C-l & Sort the summary-buffer by amount of {\bf lines}.\\
@@ -876,6 +881,7 @@
     \begin{keys}{/M}
       //   & (/s) Limit the summary-buffer to articles matching {\bf subject}.\\
       /a   & Limit the summary-buffer to articles matching {\bf author}.\\
+      /R   & Limit the summary-buffer to articles matching {\bf recipient}.\\
       /x   & Limit depending on ``extra'' headers.\\
       /u   & (x) Limit to {\bf unread} articles.
       [Prefix: also exclude ticked and dormant articles]\\
@@ -900,7 +906,7 @@
       /o   & Insert all {\bf old} articles. [Prefix: how many]\\
       /N   & Insert all {\bf new} articles.\\
       /p   & Limit to articles {\bf predicated} in the `display' group parameter.\\
-      % /r   & Limit to {\bf replied} articles. [Prefix: unreplied]\\ % No Gnus
+      /r   & Limit to {\bf replied} articles. [Prefix: unreplied]\\
     \end{keys}
     }
   }