Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-379
   Merge from erc--emacs--21

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-386
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-387
   Fix ERC bug introduced in last patch

 * emacs@sv.gnu.org/emacs--devo--0--patch-388
   Update from erc--emacs--22

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-403
   Rcirc update from Ryan Yeske

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-411
   Miscellaneous tq-related fixes.

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

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

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

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

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

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

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

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


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

14 files changed, 722 insertions, 484 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 627d536ee69..100460e9b93 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,79 @@
+2006-08-25  Richard Stallman  <rms@gnu.org>
+
+        * TUTORIAL: Give priority to graphical terminals over text terminals
+        regarding C-z.
+
+2006-08-21  Sun Yijiang  <sunyijiang@gmail.com>
+
+        * TUTORIAL.cn: Sync with the latest TUTORIAL.
+
+2006-08-20  Dave Love  <fx@gnu.org>
+
+        * emacs.py: Update to Dave Love's latest version.
+        (__all__): Fix args -> eargs.  Add new `modpath' fun.
+        (eargs): Add `imports' arg.
+        (all_names): New fun.
+        (complete): Rewrite without using rlcompleter.
+        Remove `namespace' arg, add `imports' arg.
+        (ehelp): Replace g and l args with `imports'.
+        (eimport): Use __main__ rather than `emacs' namespace.
+        (modpath): New fun.
+
+2006-08-20  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
+
+        * emacs.py (eexecfile): Use the __main__ rather than `emacs' namespace.
+
+2006-08-18  Primoz PETERLIN  <primoz.peterlin@mf.uni-lj.si>
+
+        * TUTORIAL.sl: Synchronize with TUTORIAL.
+
+2006-08-18  Mats Lidell  <matsl@contactor.se>
+
+        * TUTORIAL.sv: Synchronize with TUTORIAL.
+
+2006-08-18  Alfredo Finelli  <alfredofnl@tiscali.it>
+
+        * TUTORIAL.it: Synchronize with TUTORIAL.
+
+2006-08-15  Carsten Dominik  <dominik@science.uva.nl>
+
+        * orgcard.tex: Version number change.
+
+2006-08-12  Werner Lemberg  <wl@gnu.org>
+
+        * TUTORIAL.de: Synchronize with TUTORIAL.
+
+2006-08-10  Romain Francoise  <romain@orebokech.com>
+
+        * NEWS: Mention that zone-mode.el is now obsolete.
+
+2006-08-09  Richard Stallman  <rms@gnu.org>
+
+        * TUTORIAL: Don't say which side scroll bar is on.
+
+2006-08-06  Nick Roberts  <nickrob@snap.net.nz>
+
+        * DEBUG (Note): Add note about following a longjmp call.
+        Add local variables list for outline mode.
+
+2006-08-03  Michael Olson  <mwolson@gnu.org>
+
+        * ERC-NEWS: Update for ERC 5.1.4.
+
+2006-08-01  Kenichi Handa  <handa@m17n.org>
+
+        * NEWS (find-operation-coding-system): Describe the more detail of
+        the change.
+
+2006-07-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * GNUS-NEWS: Regenerate from Oort Gnus node in texi/gnus.texi using
+        texi/gnus-news.el of the trunk.
+
+2006-07-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * NEWS: Fix typo.
+
 2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * ru-refcard.ps: Regenerate.
@@ -168,7 +244,7 @@
 
 2006-05-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * NEWS: Mention F10 for Gtk+/Leddtif/Lucid menus.
+        * NEWS: Mention F10 for Gtk+/Lesstif/Lucid menus.
 
 2006-05-26  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/etc/DEBUG b/etc/DEBUG
index 63327b3ce5c..bc81d1d5dc2 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -272,6 +272,13 @@ related data structures in a terse and user-friendly format:
 The above commands also exist in a version with an `x' suffix which
 takes an object of the relevant type as argument.
 
+** Following longjmp call.
+
+Recent versions of glibc (2.4+?) encrypt stored values for setjmp/longjmp which
+prevents GDB from being able to follow a longjmp call using `next'.  To
+disable this protection you need to set the environment variable
+LD_POINTER_GUARD to 0.
+
 ** Using GDB in Emacs
 
 Debugging with GDB in Emacs offers some advantages over the command line (See
@@ -739,4 +746,10 @@ look at the disassembly to determine which registers are being used,
 and look at those registers directly, to see the actual current values
 of these variables.
 
+
+Local variables:
+mode: outline
+paragraph-separate: "[  ]*$"
+end:
+
 ;;; arch-tag: fbf32980-e35d-481f-8e4c-a2eca2586e6b
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 778344c68c7..3a026ee1162 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,27 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes in ERC 5.2 (unreleased)
+* Changes in ERC 5.1.4
+
+** Make find-function and find-variable work in Emacs 22 for
+names that are constructed by `define-erc-module'.
+
+** Fix bug introduced in ERC 5.1.3 that caused messages to go the
+wrong buffer.
+
+** Changes and additions to modules
+
+*** Highlighting (erc-match.el)
+
+**** Don't activate view-mode.
+
+*** Logging (erc-log.el)
+
+**** When this module is activated, make sure logging is enabled on
+already-opened buffers.  Ditto for disabling logging when the module
+is deactivated.
+
+**** Fix some errors that occur when exiting Emacs without first
+quitting open IRC servers.
 
 * Changes in ERC 5.1.3
 
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index f13b4fa5dd3..31f9ad6613e 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,151 +1,200 @@
 GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
 For older news, see Gnus info node "New Features".
 
 
-* Changes in Oort Gnus
+* Installation changes
 
-** `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.
+** Upgrading from previous (stable) version if you have used Oort.
 
-** `gnus-group-read-ephemeral-group' can be called interactively, using `G M'.
+If you have tried Oort (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.
 
-** In draft groups, `e' is now bound to `gnus-draft-edit-message'.
-Use `B w' for `gnus-summary-edit-article' instead.
+** Lisp files are now installed in `.../site-lisp/gnus/' by default.  It
+defaulted to `.../site-lisp/' formerly.  In addition to this, the new
+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'.
 
-** The revised Gnus FAQ is included in the manual.
-See the info node "Frequently Asked Questions".
+** New `make.bat' for compiling and installing Gnus under MS Windows
 
-** Upgrading from previous (stable) version if you have used Oort.
+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, iff you want to install Gnus after
+compiling it, give `make.bat' `/copy' as the second parameter.
 
-If you have tried Oort (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 safe in general.
+`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.
 
-** Article Buttons
+The new `make.bat' makes `make-x.bat' and `xemacs.mak' superfluous, so
+they have been removed.
 
-More buttons for URLs, mail addresses, Message-IDs, Info links, man pages and
-Emacs or Gnus related references, see the info node "Article Buttons".  The
-variables `gnus-button-*-level' can be used to control the appearance of all
-article buttons, see the info node "Article Button Levels".
+** `~/News/overview/' not used.
 
-** Dired integration
+As a result of the following change, the `~/News/overview/' directory is
+not used any more.  You can safely delete the entire hierarchy.
 
-`gnus-dired-minor-mode' installs key bindings in dired buffers to send a file
-as an attachment (`C-c C-m C-a'), open a file using the approriate mailcap
-entry (`C-c C-m C-l'), and print a file using the mailcap entry (`C-c C-m
-C-p').  See the info node "Other modes".
+** `(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.
 
-** Gnus can display RSS newsfeeds as a newsgroup.  To get started do `B
-nnrss RET RET' in the Group buffer.
+File `gnus-load.el' contains autoload commands, functions and variables,
+some of which may not be included in distributions of Emacsen.
 
-** Single-part yenc encoded attachments can be decoded.
 
-** Picons
-The picons code has been reimplemented to work in Emacs 21 -- some of
-the previous options have been removed or renamed.
+
+* New packages and libraries within Gnus
 
-Picons are small "personal icons" representing users, domain and
-newsgroups, which can be displayed in the Article buffer.  To enable
-picons, install the picons database from
+** The revised Gnus FAQ is included in the manual, *Note Frequently Asked
+Questions::.
+
+** TLS wrapper shipped with Gnus
 
-      http://www.cs.indiana.edu/picons/ftp/index.html
+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.
 
-and point `gnus-picon-databases' to that location.
+** Improved anti-spam features.
+
+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::.
+
+** 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.
 
-** If the new option `gnus-treat-body-boundary' is `head', a boundary
-line is drawn at the end of the headers.
+
+
+* 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').
 
-** 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.  Setup with (gnus-delay-initialize).
+** The new variable `gnus-parameters' can be used to set group parameters.
 
-** If `auto-compression-mode' is enabled, attachments are automatically
-decompressed when activated.
+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"))))
 
-** If the new option `nnml-use-compressed-files' is non-nil,
-the nnml back end allows compressed message files.
+** Unread count correct in nnimap groups.
 
-** Signed article headers (X-PGP-Sig) can be verified with `W p'.
+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.
 
-** The Summary Buffer uses an arrow in the fringe to indicate the
-current article in Emacs 21 running on a graphical display.  Customize
-`gnus-summary-display-arrow' to disable it.
+** Group names are treated as UTF-8 by default.
 
-** 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.
+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.
 
-** If the new option `gnus-summary-display-while-building' is non-nil,
-the summary buffer is shown and updated as it's being built.
+** `gnus-group-charset-alist' and `gnus-group-ignored-charsets-alist'.
 
-** The new `recent' mark "." indicates newly arrived messages (as
-opposed to old but unread messages).
+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)
 
-** The new option `gnus-gcc-mark-as-read' automatically marks
-Gcc articles as read.
 
-** The nndoc back end now supports mailman digests and exim bounces.
+
+* Changes in summary and article mode
 
-** Gnus supports RFC 2369 mailing list headers, and adds a number of
-related commands in mailing list groups.
+** `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.
 
-** The Date header can be displayed in a format that can be read aloud
-in English, see `gnus-treat-date-english'.
+** In draft groups, `e' is now bound to `gnus-draft-edit-message'.  Use `B
+w' for `gnus-summary-edit-article' instead.
 
-** The envelope sender address can be customized when using Sendmail, see
-`message-sendmail-envelope-from'.
+** Article Buttons
 
-** diffs are automatically highlighted in groups matching
-`mm-uu-diff-groups-regexp'
+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::.
 
-** TLS wrapper shipped with Gnus
+** Single-part yenc encoded attachments can be decoded.
 
-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.
+** Picons
 
-** New make.bat for compiling and installing Gnus under MS Windows
+The picons code has been reimplemented to work in GNU Emacs--some of the
+previous options have been removed or renamed.
 
-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, iff you want to install Gnus after
-compiling it, give make.bat /copy as the second parameter.
+Picons are small "personal icons" representing users, domain and
+newsgroups, which can be displayed in the Article buffer.  *Note
+Picons::.
 
-`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.
+** If the new option `gnus-treat-body-boundary' is non-`nil', a boundary
+line is drawn at the end of the headers.
 
-The new make.bat makes make-x.bat superfluous, so it has been removed.
+** Signed article headers (X-PGP-Sig) can be verified with `W p'.
 
-** Support for non-ASCII domain names
+** The Summary Buffer uses an arrow in the fringe to indicate the current
+article.  Use `(setq gnus-summary-display-arrow nil)' to disable it.
 
-Message supports non-ASCII domain names in From:, To: and Cc: and will
-encode them 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.
+** 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
 
@@ -155,227 +204,183 @@ though it is not quoted in any way.  The variable
 `gnus-cite-unsightly-citation-regexp' matches the start of these
 citations.
 
-** gnus-article-skip-boring
+The new command `W Y f' (`gnus-article-outlook-deuglify-article') allows
+deuglifying broken Outlook (Express) articles.
 
-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'.
+** `gnus-article-skip-boring'
 
-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.
+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'.
 
-** The format spec %C for positioning point has changed to %*.
+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.
 
-** The new variable `gnus-parameters' can be used to set group parameters.
+** Smileys (`:-)', `;-)' etc) are now displayed graphically in Emacs too.
 
-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 ~/.emacs instead of ~/.newsrc.eld.  The variable maps regular
-expressions matching group names to group parameters, a'la:
+Put `(setq gnus-treat-display-smileys nil)' in `~/.gnus.el' to disable
+it.
 
-     (setq gnus-parameters
-           '(("mail\\..*"
-              (gnus-show-threads nil)
-              (gnus-use-scoring nil))
-             ("^nnimap:\\(foo.bar\\)$"
-              (to-group . "\\1"))))
+** Face headers handling.  *Note Face::.
 
-** Smileys (":-)", ";-)" etc) are now iconized for Emacs too.
+** In the summary buffer, the new command `/ N' inserts new messages and `/
+o' inserts old messages.
 
-Customize `gnus-treat-display-smileys' to disable it.
+** Gnus decodes morse encoded messages if you press `W m'.
 
-** Gnus no longer generates the Sender: header automatically.
+** `gnus-summary-line-format'
 
-Earlier it was generated iff 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'.
+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.
 
-** Features from third party message-utils.el added to message.el.
+** Deleting of attachments.
 
-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-*').
+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.
 
-** References and X-Draft-Headers are no longer generated when you
-start composing messages and `message-generate-headers-first' is nil.
+** `gnus-default-charset'
 
-** Improved anti-spam features.
+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 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.
+** Printing capabilities are enhanced.
 
-** Easy inclusion of X-Faces headers.
+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.
 
-** In the summary buffer, the new command / N inserts new messages and
-/ o inserts old messages.
+** Extended format specs.
 
-** Gnus decodes morse encoded messages if you press W m.
+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.
 
-** Unread count correct in nnimap groups.
+** `/ *' (`gnus-summary-limit-include-cached') is rewritten.
 
-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 n-f-u-a-g-n-n again.  If you were happy with the estimate and want
-to save some (minimal) time when getting new mail, remove the
-function.
-
-** Group Carbon Copy (GCC) quoting
+It was aliased to `Y c' (`gnus-summary-insert-cached-articles').  The
+new function filters out other articles.
 
-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.
+** Some limiting commands accept a `C-u' prefix to negate the match.
 
-** ~/News/overview/ not used.
+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.
 
-As a result of the following change, the ~/News/overview/ directory is
-not used any more.  You can safely delete the entire hierarchy.
+** Gnus inlines external parts (message/external).
 
-** gnus-agent
 
-The Gnus Agent has seen a major update.  It 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 backends 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 behaviour of having the Agent disabled
-by customizing `gnus-agent'.  Note that putting `(gnus-agentize)' in
-~/.gnus is not needed any more.
+
+* Changes in Message mode and related Gnus features
 
-** gnus-summary-line-format
+** Delayed articles
 
-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.
+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::.
 
-** deuglify.el (gnus-article-outlook-deuglify-article)
+** If the new option `nnml-use-compressed-files' is non-`nil', the nnml
+back end allows compressed message files.
 
-A new file from Raymond Scholz <rscholz@zonix.de> for deuglifying
-broken Outlook (Express) articles.
+** The new option `gnus-gcc-mark-as-read' automatically marks Gcc articles
+as read.
 
-** (require 'gnus-load)
+** Externalizing of attachments
 
-If you use a stand-alone Gnus distribution, you'd better add
-"(require 'gnus-load)" to your ~/.emacs after adding the Gnus
-lisp directory into load-path.
+If `gnus-gcc-externalize-attachments' or
+`message-fcc-externalize-attachments' is non-`nil', attach local files
+as external parts.
 
-File gnus-load.el contains autoload commands, functions and variables,
-some of which may not be included in distributions of Emacsen.
+** The envelope sender address can be customized when using Sendmail.
+ *Note Mail Variables: (message)Mail Variables.
 
-** gnus-slave-unplugged
+** Gnus no longer generate the Sender: header automatically.
 
-A new command which starts gnus offline in slave mode.
+Earlier it was generated iff 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'.
 
-** message-insinuate-rmail
+** Features from third party `message-utils.el' added to `message.el'.
 
-Adding (message-insinuate-rmail) in .emacs and customizing
-`mail-user-agent' to `gnus-user-agent' convinces Rmail to compose,
-reply and forward messages in Message mode, where you can enjoy the
-power of MML.
+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-*').
 
-** message-minibuffer-local-map
+** References and X-Draft-From headers are no longer generated when you
+start composing messages and `message-generate-headers-first' is `nil'.
 
-The line below enables BBDB in resending a message:
+** Easy inclusion of X-Faces headers.  *Note X-Face::.
 
-(define-key message-minibuffer-local-map [?\t] 'bbdb-complete-name)
+** Group Carbon Copy (GCC) quoting
 
-** Externalizing and deleting of attachments.
+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.
 
-If `gnus-gcc-externalize-attachments' (or
-`message-fcc-externalize-attachments') is non-nil, attach local files
-as external parts.
+** `message-insinuate-rmail'
 
-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.
+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.
 
-** gnus-default-charset
+** `message-minibuffer-local-map'
 
-The default value now guesses on the basis of your environment instead
-of using Latin-1.  Also the ".*" item in gnus-group-charset-alist is
-removed.
+The line below enables BBDB in resending a message:
+(define-key message-minibuffer-local-map [(tab)]
+  'bbdb-complete-name)
 
-** gnus-posting-styles
+** `gnus-posting-styles'
 
 Add a new format of match like
-
-        ((header "to" "larsi.*org")
-         (Organization "Somewhere, Inc."))
-
+((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."))
 
-        (header "to" "larsi.*org"
-         (Organization "Somewhere, Inc."))
-
-** message-ignored-news-headers and message-ignored-mail-headers
+** `message-ignored-news-headers' and `message-ignored-mail-headers'
 
-X-Draft-From and X-Gnus-Agent-Meta-Information have been added into
+`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 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.  Customize
-`gnus-agent-cache' to revert to the old behavior.
-
-** 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.
+** 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.
 
 ** 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.8)
-
-** The tool bar icons are now (de)activated correctly in the group
-buffer, see the variable `gnus-group-update-tool-bar'.  It's default
-value depends on your Emacs version.  (New in Gnus 5.10.8)
+"format=flowed" messages.  Also, flowed text is disabled when sending
+inline PGP signed messages.  (New in Gnus 5.10.7)
 
-** Gnus supports the generation of RFC 2298 Disposition Notification requests.
+** Gnus supports the generation of RFC 2298 Disposition Notification
+requests.
 
-This is invoked with the C-c M-n key binding from message mode.
-
-** Gnus supports Maildir groups.
-
-Gnus includes a new backend nnmaildir.el.
-
-** Printing capabilities are enhanced.
-
-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.
+This is invoked with the `C-c M-n' key binding from message mode.
 
 ** Message supports the Importance: (RFC 2156) header.
 
@@ -384,151 +389,130 @@ 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 a article or not (for cancelling and
+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 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 behaviour can be
-changed by customizing `message-insert-canlock'.
+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'.
 
-** 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.  Search the online Gnus manual for "sieve", and see the new
-Sieve manual, for more information.
-
-** Extended format specs.
+** Gnus supports PGP (RFC 1991/2440), PGP/MIME (RFC 2015/3156) and S/MIME
+(RFC 2630-2633).
 
-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.
-
-** `/ *' (gnus-summary-limit-include-cached) is rewritten.
-
-It was aliased to `Y c' (gnus-summary-insert-cached-articles). The new
-function filters out other articles.
-
-** Some limiting commands accept a C-u prefix to negate the match.
-
-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.
+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'.
 
-** Group names are treated as UTF-8 by default.
+** MML (Mime compose) prefix changed from `M-m' to `C-c C-m'.
 
-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.
+This change was made to avoid conflict with the standard binding of
+`back-to-indentation', which is also useful in message mode.
 
-** The nnml and nnfolder backends store marks for each group.
+** The default for `message-forward-show-mml' changed to the symbol `best'.
 
-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 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.
 
-** The menu bar item (in Group and Summary buffer) named "Misc" has
-been renamed to "Gnus".
+** If `auto-compression-mode' is enabled, attachments are automatically
+decompressed when activated.
 
-** 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.
+** Support for non-ASCII domain names
 
-** gnus-group-charset-alist and gnus-group-ignored-charsets-alist.
+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.
 
-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:
+** 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.
 
-   ("^han\\>" euc-kr) -> ("\\(^\\|:\\)han\\>" euc-kr)
 
-** Gnus supports PGP (RFC 1991/2440), PGP/MIME (RFC 2015/3156) and
-S/MIME (RFC 2630-2633).
+
+* Changes in back ends
 
-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'.
+** Gnus can display RSS newsfeeds as a newsgroup.  *Note RSS::.
 
-** Gnus inlines external parts (message/external).
+** The nndoc back end now supports mailman digests and exim bounces.
 
-** MML (Mime compose) prefix changed from `M-m' to `C-c C-m'.
+** Gnus supports Maildir groups.
 
-This change was made to avoid conflict with the standard binding of
-`back-to-indentation', which is also useful in message mode.
+Gnus includes a new back end `nnmaildir.el'.  *Note Maildir::.
 
-** The default for message-forward-show-mml changed to symbol best.
+** The nnml and nnfolder back ends store marks for each groups.
 
-The behaviour for the `best' value is to show MML (i.e., convert MIME
-to MML) when appropriate.  MML will not be used when forwarding signed
-or encrypted messages, as the conversion invalidate the digital
-signature.
+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.
 
-** Bug fixes.
 
 
-* Changes in Pterodactyl Gnus (5.8/5.9)
+* Appearance
 
-The Gnus NEWS entries are short, but they reflect sweeping changes in
-four areas: Article display treatment, MIME treatment,
-internationalization and mail-fetching.
+** The menu bar item (in Group and Summary buffer) named "Misc" has been
+renamed to "Gnus".
 
-** The mail-fetching functions have changed.  See the manual for the
-many details.  In particular, all procmail fetching variables are gone.
+** 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.).
 
-If you used procmail like in
+** 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.)
 
-(setq nnmail-use-procmail t)
-(setq nnmail-spool-file 'procmail)
-(setq nnmail-procmail-directory "~/mail/incoming/")
-(setq nnmail-procmail-suffix "\\.in")
+** 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.
 
-this now has changed to
+
+* Miscellaneous changes
 
-(setq mail-sources
-      '((directory :path "~/mail/incoming/"
-                   :suffix ".in")))
+** `gnus-agent'
 
-More information is available in the info doc at Select Methods ->
-Getting Mail -> Mail Sources
+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 is now a MIME-capable reader.  This affects many parts of
-Gnus, and adds a slew of new commands.  See the manual for details.
+** Gnus reads the NOV and articles in the Agent if plugged.
 
-** Gnus has also been multilingualized.  This also affects too
-many parts of Gnus to summarize here, and adds many new variables.
+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.
 
-** gnus-auto-select-first can now be a function to be
-called to position point.
+** Dired integration
 
-** The user can now decide which extra headers should be included in
-summary buffers and NOV files.
+`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.
 
-** `gnus-article-display-hook' has been removed.  Instead, a number
-of variables starting with `gnus-treat-' have been added.
+** The format spec `%C' for positioning point has changed to `%*'.
 
-** The Gnus posting styles have been redone again and now works in a
-subtly different manner.
+** `gnus-slave-unplugged'
 
-** New web-based backends have been added: nnslashdot, nnwarchive
-and nnultimate.  nnweb has been revamped, again, to keep up with
-ever-changing layouts.
+A new command which starts Gnus offline in slave mode.
 
-** Gnus can now read IMAP mail via nnimap.
 
 
 * For older news, see Gnus info node "New Features".
@@ -536,8 +520,8 @@ ever-changing layouts.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/NEWS b/etc/NEWS
index c00d13937eb..aefb11ccb2d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -95,7 +95,6 @@ doesn't automatically select the right one.
 Its name is `pt-br-refcard.tex'.  The corresponding PostScript file is
 also included.
 
-
 ---
 ** A French translation of the `Emacs Survival Guide' is available.
 
@@ -202,6 +201,13 @@ an interactively callable function.
 all frames you create.  A position specified with --geometry only
 affects the initial frame.
 
+---
+** Emacs built for MS-Windows now behaves like Emacs on X does,
+wrt its frame position: if you don't specify a position (in your
+.emacs init file, in the Registry, or with the --geometry command-line
+option), Emacs leaves the frame position to the Windows' window
+manager.
+
 +++
 ** Emacs can now be invoked in full-screen mode on a windowed display.
 When Emacs is invoked on a window system, the new command-line options
@@ -241,8 +247,9 @@ according to the value of `save-abbrevs'.
 
 +++
 ** If the environment variable EMAIL is defined, Emacs now uses its value
-to compute the default value of `use-mail-address', in preference to
+to compute the default value of `user-mail-address', in preference to
 concatenation of `user-login-name' with the name of your host machine.
+
 
 * Incompatible Editing Changes in Emacs 22.1
 
@@ -832,6 +839,13 @@ The variable `automatic-hscrolling' was renamed to
 the window now works sensibly, by automatically adjusting the window's
 vscroll property.
 
+*** New customize option `overline-margin' controls the space between
+overline and text.
+
+*** New variable `x-underline-at-descent-line' controls the relative
+position of the underline.  When set, it overrides the
+`x-use-underline-position-properties' variables.
+
 +++
 *** The new face `mode-line-inactive' is used to display the mode line
 of non-selected windows.  The `mode-line' face is now used to display
@@ -1764,9 +1778,8 @@ type "C-h i m org RET" to read that manual.  A reference card is
 available in `etc/orgcard.tex' and `etc/orgcard.ps'.
 
 +++
-** The new package dns-mode.el add syntax highlight of DNS master files.
-The key binding C-c C-s (`dns-mode-soa-increment-serial') can be used
-to increment the SOA serial.
+** The new package dns-mode.el adds syntax highlighting of DNS master files.
+It is a modern replacement for zone-mode.el, which is now obsolete.
 
 ---
 ** The new global minor mode `file-name-shadow-mode' modifies the way
@@ -1987,6 +2000,7 @@ using hi-lock-mode in an initialization file will turn on Hi Lock in all
 buffers and no warning will be issued (for compatibility with the
 behavior in older versions of Emacs).
 
+---
 ** Changes in Allout
 
 *** Topic cryptography added, enabling easy gpg topic encryption and
@@ -1995,11 +2009,19 @@ clear-text within a single file to your heart's content, using symmetric
 and/or public key modes.  Time-limited key caching, user-provided
 symmetric key hinting and consistency verification, auto-encryption of
 pending topics on save, and more, make it easy to use encryption in
-powerful ways.
+powerful ways.  Encryption behavior customization is collected in the
+allout-encryption customization group.
 
 *** `allout-view-change-hook' marked as being deprecated - use
-`allout-exposure-change-hook' instead.  Both are currently being used, but
-`allout-view-change-hook' will be ignored in a subsequent allout version.
+`allout-exposure-change-hook' instead.  Both are still invoked, but
+`allout-view-change-hook' will eventually be ignored.  The new
+`allout-exposure-change-hook' is called with args that were passed to
+`allout-flag-region', making it easier to use.
+
+*** Other allout functions which change the outline structure also have
+hooks, enabling cooperative allout enhancements.  See
+`allout-structure-added-hook', `allout-structure-deleted-hook', and
+`allout-structure-shifted-hook'.
 
 *** Default command prefix changed to "\C-c " (control-c space), to avoid
 intruding on user's keybinding space.  Customize the
@@ -2010,23 +2032,43 @@ concealed text, instead of selective-display.  This simplifies the code, in
 particular avoiding the need for kludges for isearch dynamic-display,
 discretionary handling of edits of concealed text, undo concerns, etc.
 
+*** Some previously rough topic-header format edge cases are reconciled.
+Level 1 topics use the mode's comment format, and lines starting with the
+asterisk - for instance, the comment close of some languages (eg, c's "*/"
+or mathematica's "*)") - at the beginning of line are no longer are
+interpreted as level 1 topics in those modes.  (Yay!)
+
 *** Many substantial fixes and refinements, including:
 
-   - repaired inhibition of inadvertent edits to concealed text
-   - repaired retention of topic body hanging indent upon topic depth shifts
+   - repaired regexp-quoting of custom header prefixes, so any literals
+     will now work (for instance, mathematica's "(*" is now properly
+     accepted).
+   - repaired inhibition of inadvertent edits to concealed text.
    - refuse to create "containment discontinuities", where a
      topic is shifted deeper than the offspring-depth of its' container
    - auto-fill-mode is now left inactive when allout-mode starts, if it
      already was inactive.  also, `allout-inhibit-auto-fill' custom
      configuration variable makes it easy to disable auto fill in allout
      outlines in general or on a per-buffer basis.
-   - new hook `allout-mode-deactivate-hook', for coordinating with
-     deactivation of allout-mode.
+   - mode hook changes: new hook `allout-mode-deactivate-hook', for
+     coordinating with deactivation of allout-mode.  `allout-mode-hook' is
+     now run after the `allout-mode' variable is changed, as is the new
+     `allout-mode-deactivate-hook'.
+   - allout now tolerates fielded text in outlines without disruption.
+   - hot-spot navigation now is modularized with a new function,
+     `allout-hotspot-key-handler', enabling easier articulation and
+     enhancement of the functionality by allout addons.
+   - topic body navigation is easier, where repeated beginning of line and
+     end of line key commands cycle through the actually beginning/end of
+     line and then beginning/end of topic, etc.  see new customization vars
+     `allout-beginning-of-line-cycles' and `allout-end-of-line-cycles'.
+   - repaired retention of topic body hanging indent upon topic depth shifts
    - bulleting variation is simpler and more accommodating, both in the
      default behavior and in ability to vary when creating new topics
    - mode deactivation now does cleans up effectively, more properly
      restoring affected variables and hooks to former state, removing
-     overlays, etc.
+     overlays, etc.  see `allout-add-resumptions' and
+     `allout-do-resumptions', which replace the old `allout-resumptions'.
    - included a few unit-tests for interior functionality.  developers can
      have them automatically run at the end of module load by customizing
      the option `allout-run-unit-tests-on-load'.
@@ -3506,6 +3548,9 @@ variable `calculator-radix-grouping-mode'.
 ** iso-acc.el is now obsolete.  Use one of the latin input methods instead.
 
 ---
+** zone-mode.el is now obsolete.  Use dns-mode.el instead.
+
+---
 ** cplus-md.el has been deleted.
 
 ** Ewoc changes
@@ -3654,8 +3699,10 @@ w32-use-full-screen-buffer to t.
 
 * Incompatible Lisp Changes in Emacs 22.1
 
-** The function find-operation-coding-system accepts a cons (FILENAME
-. BUFFER) in an argument correponding to the target.
+** The function find-operation-coding-system may be called with a cons
+(FILENAME . BUFFER) in the second argument if the first argument
+OPERATION is `insert-file-contents', and thus a function registered in
+`file-coding-system-alist' is also called with such an argument.
 
 ---
 ** The variables post-command-idle-hook and post-command-idle-delay have
@@ -4625,6 +4672,7 @@ keymap alist to this list.
 
 *** The definition of a key-binding passed to define-key can use XEmacs-style
 key-sequences, such as [(control a)].
+
 ** Abbrev changes:
 
 +++
@@ -5354,6 +5402,11 @@ text to being a piece of code, so you'd put a `jit-lock-defer-multiline'
 property over the second half of the command to force (deferred)
 refontification of `bar' whenever the `e' is added/removed.
 
+*** `font-lock-extend-region-functions' makes it possible to alter the way
+the fontification region is chosen.  This can be used to prevent rounding
+up to whole lines, or to extend the region to include all related lines
+of multiline constructs so that such constructs get properly recognized.
+
 ** Major mode mechanism changes:
 
 +++
@@ -5448,6 +5501,9 @@ been renamed to `disabled-command-function'.  The variable
 *** `emacsserver' now runs `pre-command-hook' and `post-command-hook'
 when it receives a request from emacsclient.
 
++++
+*** `current-idle-time' reports how long Emacs has been idle.
+
 ** Lisp file loading changes:
 
 +++
diff --git a/etc/TODO b/etc/TODO
index de0097cde87..0c807662ae1 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -21,7 +21,7 @@ a window doesn't select it.
 but if you type M-n you should get the visited file name of the
 current buffer.
 
-** whitespace-cleanup should work only on the region if the region is active.
+** describe-face should show an example of text in the face.
 
 ** Distribute a bar cursor of width > 1 evenly between the two glyphs
    on each side of the bar (what to do at the edges?).
@@ -125,6 +125,9 @@ current buffer.
 
 ** Internationalize Emacs's messages.
 
+** Set up a facility to save backtraces when errors happen during
+specified filters, specified timers, and specified hooks.
+
 ** Install mmc@maruska.dyndns.org's no-flicker change.
 
 ** Add a "current vertical pixel level" value that goes with point,
diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index 5748d0d4e5e..63e5d601fed 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -217,7 +217,7 @@ This should have scrolled the screen up by 8 lines.  If you would like
 to scroll it down again, you can give an argument to M-v.
 
 If you are using a windowed display, such as X11 or MS-Windows, there
-should be a tall rectangular area called a scroll bar at the left hand
+should be a tall rectangular area called a scroll bar at the
 side of the Emacs window.  You can scroll the text by clicking the
 mouse in the scroll bar.
 
@@ -644,18 +644,18 @@ session--this is the command C-x C-c.  (Do not worry about losing
 changes you have made; C-x C-c offers to save each changed file before
 it kills the Emacs.)
 
-C-z is the command to exit Emacs *temporarily*--so that you can go
-back to the same Emacs session afterward.
-
-On systems which allow it, C-z "suspends" Emacs; that is, it returns
-to the shell but does not destroy the Emacs.  In the most common
-shells, you can resume Emacs with the `fg' command or with `%emacs'.
+If you are using a graphical display that supports multiple
+applications in parallel, you don't need any special command to move
+from Emacs to another application.  You can do this with the mouse or
+with window manager commands.  However, if you're using a text
+terminal which can only show one application at a time, you need to
+"suspend" Emacs to move to any other program.
 
-On systems which do not implement suspending, C-z creates a subshell
-running under Emacs to give you the chance to run other programs and
-return to Emacs afterward; it does not truly "exit" from Emacs.  In
-this case, the shell command `exit' is the usual way to get back to
-Emacs from the subshell.
+C-z is the command to exit Emacs *temporarily*--so that you can go
+back to the same Emacs session afterward.  When Emacs is running on a
+text terminal, C-z "suspends" Emacs; that is, it returns to the shell
+but does not destroy the Emacs.  In the most common shells, you can
+resume Emacs with the `fg' command or with `%emacs'.
 
 The time to use C-x C-c is when you are about to log out.  It's also
 the right thing to use to exit an Emacs invoked under mail handling
diff --git a/etc/TUTORIAL.cn b/etc/TUTORIAL.cn
index a1589aa0cd7..7ba8d808c2d 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -165,7 +165,7 @@ M-comma£¨META ¶ººÅ£©¡£
 ´ó²¿·ÖµÄ Emacs ÃüÁî½ÓÊÜÊý×Ö²ÎÊý£¬²¢ÇÒ¶ÔÓÚ¶àÊýÃüÁî¶øÑÔ£¬ÕâЩÊý×Ö²ÎÊýµÄ×÷
 ÓÃÊÇÖ¸¶¨ÃüÁîµÄÖظ´´ÎÊý¡£ÎªÒ»¸öÃüÁîÖ¸¶¨Êý×Ö²ÎÊý£¨Ò²¾ÍÊÇÖظ´´ÎÊý£©µÄ·½·¨
 ÊÇ£ºÏÈÊäÈë C-u£¬È»ºóÊäÈëÊý×Ö×÷Ϊ²ÎÊý£¬×îºóÔÙÊäÈëÃüÁî¡£Èç¹ûÄãÓÐMETA £¨»ò
-EDIT »ò ALT£©¼ü£¬ÄÇô»¹ÓÐÁíÒ»ÖÖ°ì·¨£º°´×¡ META ¼ü²»¶¯£¬È»ºóÊäÈëÊý×Ö¡£²»
+EDIT »ò ALT£©¼ü£¬ÄÇô»¹ÓÐÁíÒ»ÖÖ°ì·¨£º°´×¡ META ¼ü²»·Å£¬È»ºóÊäÈëÊý×Ö¡£²»
 ¹ýÎÒÃÇ»¹Êǽ¨ÒéÄãÓà C-u£¬ÒòΪËüÔÚÈκÎÖն˻úÉ϶¼ÄÜÓá£ÕâÖÖÊý×Ö²ÎÊýÒ²³ÆΪ
 ¡°Ç°×º²ÎÊý¡±£¬Òâ˼ÊÇ˵Õâ¸ö²ÎÊýÊÇÏÈÓÚʹÓÃËüµÄÃüÁî¶øÊäÈëµÄ¡£
 
@@ -174,9 +174,9 @@ EDIT »ò ALT£©¼ü£¬ÄÇô»¹ÓÐÁíÒ»ÖÖ°ì·¨£º°´×¡ META ¼ü²»¶¯£¬È»ºóÊäÈëÊý×Ö¡£²»
 >> Ϊ C-n »òÕß C-p Ö¸¶¨Ò»¸öÊý×Ö²ÎÊý£¬ÕâÑùÄã¿ÉÒÔÖ»ÓÃÒ»¸öÃüÁî¾Í°Ñ¹â±êÒƶ¯
    µ½±¾Ðеĸ½½ü¡£
 
-ËäÈ»´ó²¿·ÖÃüÁîÓÃÊý×Ö²ÎÊýÀ´×÷ΪÆäÖظ´´ÎÊý£¬µ«ÊÇÒ²ÓÐЩÃüÁîÀýÍ⣬ËüÃǽ«Êý
-×Ö²ÎÊýÁí×öËüÓᣱÈÈçÓÐЩÃüÁĿǰ»¹Ã»Ñ§µ½£©½ö½ö½«Ç°×º²ÎÊý×÷Ϊһ¸ö±ê
-Ö¾¡ª¡ªÖ»ÒªÓÐÒ»¸öǰ׺²ÎÊý³öÏÖ£¬²»¹ÜÆäֵΪºÎ£¬ÃüÁîµÄ¹¦Äܶ¼»á¸Ä±ä¡£
+ËäÈ»´ó²¿·ÖÃüÁî°ÑÊý×Ö²ÎÊý½âÊÍΪÆäÖظ´´ÎÊý£¬µ«ÊÇÒ²ÓÐЩÃüÁîÀýÍ⣬ËüÃǽ«Êý
+×Ö²ÎÊýÁí×öËüÓᣱÈÈçÓÐЩÃüÁÎÒÃÇÄ¿Ç°»¹Ã»Ñ§µ½£©½ö½ö½«Ç°×º²ÎÊý×÷Ϊһ¸ö
+±êÖ¾¡ª¡ªÖ»Òª¸ø³öÓÐÒ»¸öǰ׺²ÎÊý£¬²»¹ÜÆäֵΪºÎ£¬Ëü¶¼»á¸Ä±äÃüÁîµÄ¹¦ÄÜ¡£
 
 ¶ø C-v ºÍ M-v ÔòÊôÓÚÁíÒ»ÖÖÀàÐ͵ÄÀýÍâ¡£µ±¸ø¶¨Ò»¸ö²ÎÊýʱ£¬ËüÃǽ«¹ö¶¯ÄãÖ¸
 ¶¨µÄ¡°ÐÐÊý¡±£¬¶ø²»ÊÇ¡°ÆÁÊý¡±¡£¾ÙÀýÀ´Ëµ£¬C-u 8 C-v ½«ÆÁÄ»ÏòϹö¶¯ 8 ÐУ¬
@@ -188,8 +188,8 @@ EDIT »ò ALT£©¼ü£¬ÄÇô»¹ÓÐÁíÒ»ÖÖ°ì·¨£º°´×¡ META ¼ü²»¶¯£¬È»ºóÊäÈëÊý×Ö¡£²»
 ÒÔ¸ø¶¨Ò»¸ö²ÎÊýÈ»ºóÖ´ÐÐ M-v¡£
 
 Èç¹ûÄãÕýÔÚʹÓÃÒ»¸ö´°¿Úϵͳ£¬±ÈÈç X11 »òÕß΢ÈíµÄ Windows£¬ÄÇôÔÚ Emacs
-´°¿ÚµÄ×ó±ß»òÕßÓÒ±ßÓ¦¸ÃÓÐÒ»¸ö³¤·½ÐεÄÇøÓò½Ð¡°¹ö¶¯Ìõ¡±£¬Äã¿ÉÒÔÓÃÊó±ê²Ù×Ý
-¹ö¶¯ÌõÀ´¹ö¶¯ÎÄ×Ö¡£
+´°¿ÚµÄ±ßÔµÓ¦¸ÃÓÐÒ»¸ö³¤·½ÐεÄÇøÓò½Ð¡°¹ö¶¯Ìõ¡±£¬Äã¿ÉÒÔÓÃÊó±ê²Ù×ݹö¶¯ÌõÀ´
+¹ö¶¯ÎÄ×Ö¡£
 
 >> ÊÔ×ÅÔÚ¡°¹ö¶¯ÌõÄڵķ´°×ÇøÓò¡±ÉÏ°´Ò»ÏÂÊó±êÖмü¡£
    ÎÄ×ÖÓ¦¸Ã»á¹ö¶¯µ½Êó±êËùָʾµÄλÖá£
@@ -202,10 +202,10 @@ EDIT »ò ALT£©¼ü£¬ÄÇô»¹ÓÐÁíÒ»ÖÖ°ì·¨£º°´×¡ META ¼ü²»¶¯£¬È»ºóÊäÈëÊý×Ö¡£²»
 * ÔÚ EMACS ʧȥÏìÓ¦µÄʱºò£¨WHEN EMACS IS HUNG£©
 -----------------------------------------------
 
-Èç¹û Emacs ¶ÔÄãµÄÃüÁîʧȥÏìÓ¦£¬Äã¿ÉÒԺܰ²È«µØÓà C-g À´ÖÕÖ¹Õâ¸öÃüÁî¡£
-C-g Ò²¿ÉÒÔ±»ÓÃÀ´ÖÕÖ¹Ò»¸öÖ´Ðйý¾ÃµÄÃüÁî¡£
+Èç¹û Emacs ¶ÔÄãµÄÃüÁîʧȥÏìÓ¦£¬Äã¿ÉÒÔÓà C-g À´°²È«µØÖÕÖ¹ÕâÌõÃüÁî¡£C-g
+Ò²¿ÉÒÔÖÕÖ¹Ò»ÌõÖ´Ðйý¾ÃµÄÃüÁî¡£
 
-C-g »¹¿ÉÒÔ±»À´È¡ÏûÊý×Ö²ÎÊýºÍÄÇЩÊäÈëµ½Ò»°ëµÄÃüÁî¡£
+C-g »¹¿ÉÒÔÈ¡ÏûÊý×Ö²ÎÊýºÍÖ»ÊäÈëµ½Ò»°ëµÄÃüÁî¡£
 
 >> ÊäÈë C-u 100 É趨һ¸öֵΪ 100 µÄÊý×Ö²ÎÊý£¬È»ºó°´ C-g¡£
    ÏÖÔÚÔÙ°´ C-f£¬¹â±êÓ¦¸ÃÖ»»áÒƶ¯Ò»¸ö×Ö·û£¬ÒòΪÄãÒѾ­Óà C-g È¡ÏûÁ˲ÎÊý¡£
@@ -219,16 +219,16 @@ C-g »¹¿ÉÒÔ±»À´È¡ÏûÊý×Ö²ÎÊýºÍÄÇЩÊäÈëµ½Ò»°ëµÄÃüÁî¡£
 -----------------------------------
 
 ÓÐһЩ Emacs ÃüÁî±»¡°½ûÓá±ÁË£¬ÒÔ±ÜÃâ³õѧÕßÔÚ²»Á˽âÆäÈ·Çй¦ÄܵÄÇé¿öÏÂÎó
-ÓÃÕâЩÃüÁÔì³ÉÂé·³¡£
+ÓÃËüÃÇ£¬Ôì³ÉÂé·³¡£
 
 Èç¹ûÄãÓõ½ÁËÒ»¸ö±»½ûÓõÄÃüÁEmacs »áÏÔʾһ¸öÌáʾÏûÏ¢£¬¸æËßÄãÕâ¸öÃüÁî
 µ½µ×ÊǸÉʲôµÄ£¬Ñ¯ÎÊÄãÊÇ·ñÒª¼ÌÐø£¬²¢Ôڵõ½ÄãµÄ¿Ï¶¨Ö®ºóÔÙÖ´ÐÐÕâÃüÁî¡£
 
-ÄãÒªÊÇÕæµÄÏëÖ´Ðб»½ûÓõÄÃüÁÄÇôÔÚ Emacs ѯÎÊÄãµÄʱºòÓ¦¸Ã°´¿Õ¸ñ¡£Ò»°ã
-À´Ëµ£¬Èç¹ûÄã²»ÏëÖ´ÐУ¬°´¡°n¡±¾ÍÐÐÁË¡£
+Èç¹ûÄãÕæµÄÏëÓÃÕâÌõÃüÁÔÚ Emacs ѯÎÊÄãµÄʱºòÓ¦¸Ã°´¿Õ¸ñ¡£Ò»°ãÀ´Ëµ£¬Èç¹û
+Äã²»ÏëÓ㬾Ͱ´¡°n¡±¡£
 
 >> ÊÔÊÔ C-x C-l £¨ÕâÊÇÒ»¸ö±»½ûÓõÄÃüÁ
-   È»ºóÓà n À´»Ø´ðÎÊÌâ¡£
+   È»ºóÓà n À´»Ø´ðѯÎÊ¡£
 
 
 * ´°¸ñ£¨WINDOWS£©
@@ -245,7 +245,7 @@ Emacs ¿ÉÒÔÓжà¸ö´°¸ñ£¬Ã¿¸ö´°¸ñ¶¼ÏÔʾ²»Í¬µÄÎÄ×Ö¡£ÎÒÃǺóÃæÔÙ½éÉÜÔõô¶Ô¸¶
 >> °Ñ¹â±êÒƵ½±¾ÐÐÈ»ºóÊäÈë C-u 0 C-l¡£
 
 >> ÊäÈë CONTROL-h k CONTROL-f¡£¹Û²ìµ±Ò»¸öд°¸ñ³öÏÖʱµ±Ç°´°¸ñ£¨ÓÃÀ´ÏÔʾ
-   CONTROL-f ÃüÁîµÄÎĵµ£©ÊÇÈçºÎËõСµÄ¡£
+   CONTROL-f ÃüÁîµÄÎĵµ£©ÊÇÈçºÎ±äСµÄ¡£
 
 >> ÊäÈë C-x 1 ¹ØµôÎĵµ´°¸ñ¡£
 
@@ -265,33 +265,33 @@ Emacs ÊÓΪÎÄ×Ö²¢ÇÒ¿ÉÒÔÖ±½Ó²åÈë¡£Çà <Return>£¨»Ø³µ¼ü£©»á²åÈëÒ»¸ö»»Ðзû¡£
 Ó÷¨Ó¦¸ÃÒ»Ñù¡£Ò»°ãÀ´Ëµ <Delback> ¾ÍÊÇλÓÚ <Return> ¼üÉÏ·½Ä³´¦µÄÒ»¸ö´óºÅ
 ¼ü£¬Í¨³£±»±êʾΪ¡°Delete¡±¡¢¡°Del¡±»òÕß¡°Backspace¡±¡£
 
-Èç¹ûÄãÕÒµ½Á˱ê×Å¡°Backspace¡±µÄ¼ü£¬ÄÇôËüÓ¦¸Ã¾ÍÊÇ <Delback>£»¼´±ãÄãÓÖÔÚ
-¼üÅÌÆäËüµØ·½ÕÒµ½ÁËÒ»¸ö±êʾΪ¡°Del¡±µÄ¼ü£¬ÄÇôËüÒ²Ó¦¸Ã²»ÊÇ <Delback>¡£
+Èç¹ûÄãÕÒµ½ÁË¡°Backspace¡±¼ü£¬ÄÇôËüÓ¦¸Ã¾ÍÊÇ <Delback>£»ÄÄÅÂÄãÓÖÔÚ±ðµÄµØ
+·½ÕÒµ½ÁËÒ»¸ö¡°Del¡±¼ü£¬ÄÇôËüÒ²Ó¦¸Ã²»ÊÇ <Delback>¡£
 
-Ò»ÖÖ¸üͨÓõÄ˵·¨ÊÇ£¬<Delback> ½«Î»ÓÚ¹â±êÇ°µÄÒ»¸ö×Ö·ûɾ³ý¡£
+Ò»ÖÖ¸üͨÓõÄ˵·¨ÊÇ£¬<Delback> ½«É¾³ýλÓÚ¹â±êÇ°µÄÒ»¸ö×Ö·û¡£
 
 >> ÏÖÔÚ¾ÍÊÔÊÔ¡ª¡ªÇõã×Ö£¬È»ºó°´¼¸Ï <Delback> ɾ³ýËüÃÇ¡£
    ²»Óõ£ÐÄÄã»áÐÞ¸ÄÎļþ£¬Äã¸Éʲô¶¼Ã»¹Øϵ£¬ÕâÀï¾ÍÊÇר¸øÄãÁ·Ï°Óõġ£
 
 Èç¹ûÒ»ÐÐÎÄ×ֺܳ¤¡¢³¬³öÁË´°¸ñµÄ¿í¶È£¬ÏÔʾ²»ÏµIJ¿·Ö»áÔÚ½ôÁÚµÄÏÂÒ»ÐмÌÐø
-ÏÔʾ¡£Õâʱ»áÓÐÒ»¸ö·´Ð±Ïߣ¨¿ØÖÆ̨ÏÂÊÇ·´Ð±Ïߣ¬Èç¹ûÄãÓÃͼÐδ°¿Úϵͳ£¬ÔòÓ¦
-¸ÃÊÇÒ»¸öССµÄתÍä¼ýÍ·£©ÏÔʾÔÚÓÒ±ßÑØ£¬±íÃ÷ÕâÊÇijһÐеĽÓÐøÏÔʾ¡£
+ÏÔʾ¡£Õâʱ»áÓÐÒ»¸ö·´Ð±Ïߣ¨ÔÚ¿ØÖÆ̨ÏÂÊÇ·´Ð±Ïߣ¬Èç¹ûÄãÓÃͼÐδ°¿Úϵͳ£¬Ôò
+Ó¦¸ÃÊÇÒ»¸öССµÄתÍä¼ýÍ·£©ÏÔʾÔÚÓÒ±ßÑØ£¬±íÃ÷ÕâÊÇijһÐеĽÓÐøÏÔʾ¡£
 
 >> ÊäÈëÎÄ×Ö£¬Ò»Ö±µ½ÆÁÄ»µÄÓұ߽磬Ȼºó¼ÌÐø£¬Äã»á¿´µ½Ò»¸ö½ÓÐøÐгöÏÖ¡£
 
 >> Óà <Delback> ɾµôһЩÎÄ×Ö£¬Ö±µ½´ËÐ㤶ÈСÓÚ´°¸ñ¿í¶È£¬½ÓÐøÐоÍÏûʧÁË¡£
 
-Äã¿ÉÒÔÏñɾ³ýÆäËû×Ö·ûÒ»Ñùɾ³ý»»Ðзû¡£É¾³ýÁ½ÐÐÖмäµÄ»»Ðзû»á½«Á½Ðкϲ¢³É
-Ò»ÐС£Èç¹ûºÏ²¢µÄ½á¹ûʹÕâÒ»ÐÐÌ«³¤£¬³¬³öÁË´°¸ñµÄ¿í¶È£¬Ëü¾Í»áÒÔÒ»¸ö½ÓÐøÐÐ
-À´ÏÔʾ¡£
+»»Ðзû¸úÆäËû×Ö·ûÒ»Ñù¿ÉÒÔ±»É¾³ý¡£Á½ÐÐÖмäµÄ»»Ðзû±»É¾³ýºó£¬ÕâÁ½Ðн«»áºÏ
+²¢³ÉÒ»ÐС£Èç¹ûºÏ²¢ºóµÄÕâÒ»ÐÐÌ«³¤£¬³¬³öÁË´°¸ñ¿í¶È£¬Ëü¾Í»áÒÔÒ»¸ö½ÓÐøÐÐÀ´
+ÏÔʾ¡£
 
->> Òƶ¯¹â±êµ½±¾ÐеĿªÍ·²¢ÊäÈë <Delback>¡£
-   Õâʱ±¾ÐÐÓëÆäÇ°Ò»Ðн«±»ºÏ²¢ÎªÒ»ÐС£
+>> Òƶ¯¹â±êµ½Ä³ÐеĿªÍ·²¢ÊäÈë <Delback>¡£
+   Õâʱ¸ÃÐн«ÓëÆäÇ°Ò»ÐÐÒ»Æ𱻺ϲ¢ÎªÒ»ÐС£
 
 >> ÊäÈë <Return> ÖØвåÈëÄã¸Õ²Åɾ³ýµÄ»»Ðзû¡£
 
-Ç°Ãæ˵¹ý£¬´ó²¿·ÖµÄ Emacs ÃüÁ¿ÉÒÔÖ¸¶¨Öظ´´ÎÊý£¬ÕâÆäÖÐÒ²°üÀ¨ÊäÈë×Ö·ûµÄ
-ÃüÁî¡£Öظ´Ö´ÐÐÊäÈë×Ö·ûµÄÃüÁîʵ¼ÊÉϾÍÊÇÊäÈë¶à¸öÒ»ÑùµÄ×Ö·û¡£
+Ç°Ãæ½²¹ý£¬´ó²¿·ÖµÄ Emacs ÃüÁ¿ÉÒÔÖ¸¶¨Öظ´´ÎÊý£¬ÕâÆäÖÐÒ²°üÀ¨ÊäÈë×Ö·ûµÄ
+ÃüÁî¡£Öظ´Ö´ÐÐÊäÈë×Ö·ûµÄÃüÁîʵ¼ÊÉϾÍÊÇÊäÈë¶à¸öÏàͬµÄ×Ö·û¡£
 
 >>  ÊÔÊÔ C-u 8 *£¬Õ⽫»á²åÈë ********¡£
 
@@ -329,10 +329,10 @@ C-SPC ÍùÍù±»ÖÐÎÄÓû§É趨³ÉÊäÈë·¨Èȼü£¬Èç¹ûÕâÑù£¬C-SPC ¾Í±»ÏµÍ³À¹½Ø¶øÎÞ
 ×¢Òâ,¡°ÒƳý£¨kill£©¡±ºÍ¡°É¾³ý£¨delete£©¡±µÄ²»Í¬ÔÚÓÚ±»ÒƳýµÄ¶«Î÷¿ÉÒÔÕÒ»Ø
 À´£¬¶ø±»É¾³ýµÄ¾Í²»ÐÐÁË¡£¡¾Êµ¼ÊÉÏ£¬ÒƳýµôµÄ¶«Î÷ËäÈ»¿´ÆðÀ´¡°Ïûʧ¡±ÁË£¬µ«
 ʵ¼ÊÉϱ» Emacs ¼Ç¼ÁËÏÂÀ´£¬Òò´Ë»¹¿ÉÒÔÕÒ»ØÀ´£»¶øɾ³ýµôµÄ¶«Î÷ËäȻҲ¿ÉÄÜ»¹
-ÔÚÄÚ´æÀµ«ÊÇÒѾ­±»Emacs¡°Å×Æú¡±ÁË£¬ËùÒÔ¾ÍÕÒ²»»ØÀ´ÁË¡£¡¿ÖØвåÈë±»ÒƳý
-µÄÎÄ×Ö³ÆΪ¡°Õٻأ¨yank£©¡±¡£Ò»°ã¶øÑÔ£¬ÄÇЩ»áÈ¥³ýºÜ¶àÎÄ×ÖµÄÃüÁî»á°ÑÈ¥³ý
-µôµÄÎÄ×Ö´¢´æÆðÀ´£¨ËüÃDZ»É趨³ÉÁË¡°¿ÉÕٻء±£©£¬¶øÄÇЩֻÊÇÈ¥³ýÒ»¸ö×Ö·û»ò
-ÕßÖ»ÊÇÈ¥³ý¿Õ°×µÄÃüÁî¾Í²»»á´¢´æÄÇЩ±»È¥³ýµôµÄ¶«Î÷£¨Òò´ËÄã¾ÍÎÞ·¨Õٻأ©¡£
+ÔÚÄÚ´æÀµ«ÊÇÒѾ­±» Emacs¡°Å×Æú¡±ÁË£¬ËùÒÔ¾ÍÕÒ²»»ØÀ´ÁË¡£¡¿ÖØвåÈë±»ÒÆ
+³ýµÄÎÄ×Ö³ÆΪ¡°Õٻأ¨yank£©¡±¡£Ò»°ã¶øÑÔ£¬ÄÇЩ»áÈ¥³ýºÜ¶àÎÄ×ÖµÄÃüÁî»á°ÑÈ¥
+³ýµôµÄÎÄ×Ö´¢´æÆðÀ´£¨ËüÃDZ»É趨³ÉÁË¡°¿ÉÕٻء±£©£¬¶øÄÇЩֻÊÇÈ¥³ýÒ»¸ö×Ö·û
+»òÕßÖ»ÊÇÈ¥³ý¿Õ°×µÄÃüÁî¾Í²»»á´¢´æ±»È¥³ýµôµÄ¶«Î÷£¨×ÔÈ»Äã¾ÍÎÞ·¨ÕÙ»ØÁË£©¡£
 
 >> Òƶ¯¹â±êµ½Ò»·Ç¿Õ°×ÐеÄÐÐÍ·£¬È»ºóÊäÈë C-k ÒƳýÄÇÒ»ÐÐÉϵÄÎÄ×Ö¡£
 
@@ -409,9 +409,9 @@ C-_ Ò²Êdz·ÏúÃüÁËüµÄ×÷Óøú C-x u Ò»Ñù£¬µ«ÊÇËü±È½ÏÈÝÒ׶à´ÎÊäÈë¡£C-_ µÄ
 ´æÅÌ£¬¾ÍÒªÔڱ༭ǰ¡°Ñ°ÕÒ¡±µ½Ò»¸ö´æÅÌÎļþ¡££¨Õâ¸ö¹ý³Ìͨ³£Ò²±»³ÆΪ¡°·ÃÎÊ¡±
 Îļþ¡££©
 
-Ñ°ÕÒµ½Ò»¸öÎļþÒâζ×ÅÄã¿ÉÒÔÔÚ Emacs Àï²é¿´Õâ¸öÎļþµÄÄÚÈÝ¡£´ÓºÜ¶à½Ç¶È½²£¬
+Ñ°ÕÒµ½Ò»¸öÎļþÒâζ×ÅÄã¿ÉÒÔÔÚ Emacs Àï²é¿´Õâ¸öÎļþµÄÄÚÈÝ¡£´ÓºÜ¶à·½Ãæ½²£¬
 Õâ¾ÍµÈÓÚÄãÔÚÖ±½Ó±à¼­Õâ¸öÎļþ¡£µ«ÊÇÄãËù×öµÄÐÞ¸ÄÖ»ÓÐÔÚ¡°´æÅÌ¡±µÄʱºò²Å»á
-±»Ð´ÈëÎļþ¡£Ò²ÕýÒòΪÈç´Ë£¬Äã¿ÉÒÔ¶ªÆúÒ»¸ö¸Äµ½Ò»°ëµÄÎļþ¶ø²»±Ø°ÑÕâ¸ö²Ð·Ï
+±»Ð´ÈëÎļþ¡£Ò²ÕýÒòΪÈç´Ë£¬Äã¿ÉÒÔ¶ªÆúÒ»¸ö¸Äµ½Ò»°ëµÄÎļþ¶ø²»±Ø°ÑÕâ¸ö²Ðȱ
 ÎļþÒ²±£´æµ½¼ÆËã»úÉÏ¡£×îºó¾ÍËãÄãÕæÕý´æÁËÅÌ£¬Emacs Ò²»á°Ñ´æÅÌÇ°µÄÎļþÖØ
 ÃüÃû±£´æ£¬ÒÔ·ÀÄã¸ÄÍêÖ®ºóÓÖÏë·´»Ú¡£
 
@@ -572,10 +572,10 @@ replace-string£¨×Ö·û´®Ìæ»»£©Õâ¸öÃüÁËü»áÔÚÈ«ÎÄ·¶Î§ÄÚ°ÑÒ»¸ö×Ö·û´®Ìæ»»
 ×Ö·û´®Ìæ»»ÃüÁîÐèÒªÁ½¸ö²ÎÊý¡ª¡ª±»Ìæ»»µÄ×Ö·û´®ºÍÓÃÀ´Ìæ»»ËüµÄ×Ö·û´®¡£Ã¿¸ö
 ²ÎÊýµÄÊäÈëÓû»ÐзûÀ´½áÊø¡£
 
->> ½«¹â±êÒƵ½±¾ÐеÄÏÂÁ½Ðпհף¬È»ºóÊäÈë
+>> ½«¹â±êÒƵ½±¾ÐÐÏÂÃæµÚ¶þÐеĿհ״¦£¬È»ºóÊäÈë
    M-x repl s<Return>changed<Return>altered<Return>¡£
 
-   ¡¾ÎªÁ˼ÌÐøÁ·Ï°£¬±£ÁôÒ»ÐÐÔ­ÎÄÈçÏ£º
+   ¡¾ÒÔϱ£ÁôÒ»ÐÐÔ­ÎÄ£¬ÒÔÓ¦Á·Ï°Ö®Ð裺
    Notice how this line has changed: you've replaced... ¡¿
 
 Çë×¢ÒâÕâÒ»ÐÐÊÇÔõô¸Ä±äµÄ£ºÔÚ¹â±êÖ®ºóµÄ·¶Î§ÄÚ£¬ÄãÒѾ­½«¡°changed¡±Õâ¸ö
@@ -617,7 +617,7 @@ replace-string£¨×Ö·û´®Ìæ»»£©Õâ¸öÃüÁËü»áÔÚÈ«ÎÄ·¶Î§ÄÚ°ÑÒ»¸ö×Ö·û´®Ìæ»»
 ¹ûλÓÚÎļþµÄĩ⣬¾ÍÏÔʾ --Bot--¡£Èç¹ûÎļþºÜС£¬Ò»ÆÁ¾Í×ãÒÔÏÔʾȫ²¿ÄÚÈÝ£¬
 ÄÇô״̬À¸»áÏÔʾ --All--¡£
 
-L ºÍÆäºóµÄÊý×Ö¸ø³öÁ˹â±êËùÔÚÐеÄÐкš£
+¡°L¡± ºÍÆäºóµÄÊý×Ö¸ø³öÁ˹â±êËùÔÚÐеÄÐкš£
 
 ×ͷµÄÐǺţ¨*£©±íʾÄãÒѾ­¶ÔÎÄ×Ö×ö¹ý¸Ä¶¯¡£¸Õ¸Õ´ò¿ªµÄÎļþ¿Ï¶¨Ã»Óб»¸Ä¶¯
 ¹ý£¬ËùÒÔ״̬À¸ÉÏÏÔʾµÄ²»ÊÇÐǺŶøÊǶÌÏߣ¨-£©¡£
@@ -690,14 +690,14 @@ Emacs ¿ÉÒÔÏòÇ°»òÕßÏòºóËÑË÷×Ö·û´®¡£ËÑË÷ÃüÁîÊÇÒ»¸öÒƶ¯¹â±êµÄÃüÁËÑË÷³É
 ¹¦ºó£¬¹â±ê»áÍ£ÁôÔÚËÑË÷Ä¿±ê³öÏֵĵط½¡£
 
 Emacs µÄËÑË÷ÃüÁîµÄ¶ÀÌØÖ®´¦ÔÚÓÚ£¬ËüÊÇ¡°½¥½øµÄ£¨incremental£©¡±£¬Òâ˼ÊÇËÑ
-Ë÷ÓëÊäÈëͬʱ½øÐУºÄãÔÚÕâ±ßÒ»¸ö×ÖÒ»¸ö×ÖµØÊäÈëÄãÏëËÑË÷µÄ¶«Î÷£¬Í¬Ê± Emacs
-ÔÚÄDZ߾ÍÌæÄãËÑË÷ÁË¡£
+Ë÷ÓëÊäÈëͬʱ½øÐУºÄãÔÚ¼üÅÌÉÏÒ»×ÖÒ»¾äµØÊäÈëËÑË÷´ÊµÄ¹ý³ÌÖУ¬Emacs ¾ÍÒѾ­
+¿ªÊ¼ÌæÄãËÑË÷ÁË¡£
 
 C-s ÊÇÏòÇ°ËÑË÷£¬C-r ÊÇÏòºóËÑË÷¡£²»¹ýÊÖ±ðÕâô¿ì£¡Ïȵȵȱð׿±ÊÔ¡£
 
-ÔÚÄã°´Ï C-s Ö®ºó£¬Äã»á·¢ÏÖ»ØÏÔÇøÀïÓС°I-search¡±×ÖÑù³öÏÖ£¬ÕâÊÇÔÚÌáʾ
-ÄãÄ¿Ç° Emacs Õý´¦ÓÚ¡°½¥½øËÑË÷¡±×´Ì¬£¬ÕýÔڵȴýÄãÊäÈëËÑË÷×Ö´®¡£<Return>
-»á½áÊøËÑË÷¡£
+ÔÚÄã°´Ï C-s Ö®ºó£¬Äã»á·¢ÏÖ»ØÏÔÇøÀïÓС°I-search¡±×ÖÑù³öÏÖ£¬ÌáʾÄãÄ¿Ç°
+Emacs Õý´¦ÓÚ¡°½¥½øËÑË÷¡±×´Ì¬£¬ÕýÔڵȴýÄãÊäÈëËÑË÷×Ö´®¡£°´ <Return> »á½á
+ÊøËÑË÷¡£
 
 >> ÊäÈë C-s ¿ªÊ¼Ò»¸öËÑË÷¡£×¢ÒâÇÃÂýÒ»µã£¬Ò»´ÎÊäÈëÒ»¸ö×Ö·û¡£
    ÂýÂýÊäÈë¡°cursor¡±Õû¸ö´Ê£¬Ã¿ÇÃÒ»¸ö×Ö¾ÍÔÝͣһϣ¬×¢Òâ¹Û²ì¹â±ê¡£
@@ -917,10 +917,10 @@ Emacs ÀïÀ´£¬ÇëÓà C-z¡£¡¾Çл»µ½ shell ½ö¶Ô¿ØÖÆ̨Ï嵀 Emacs ÓÐЧ¡¿
 
 Emacs ¿ìËÙÖ¸ÄÏ£¨Tutorial£©ÔçÓÐÁ½¸öÁõÕѺêµÄÖÐÎÄÒë±¾£¬·±¼ò¸÷Ò»¡£Æä¼òÌå°æ±¾
 £¨TUTORIAL.cn£©»ù±¾ÓÉ·±Ìå°æ±¾£¨TUTORIAL.zh£©¾­´ÊÓïÌæ»»¶øµÃ¡£È»¶ø·±¼òÖÐÎÄ
-²»½öÔÚÓôÊÏ°¹ßÉÏÓÐËù²»Í¬£¬¸üÓÐÖî¶à±í´ï·½Ê½ºÍ¾ä·¨·½ÃæµÄ²îÒì¡£Òò´ËÒ»Ö±ÒÔÀ´
-ÔĶÁ TUTORIAL.cn ¶¼ÂÔ¾õ»ÞɬºÍÉúÓ²¡£Õâ´ÎÖØз­Òë TUTORIAL.cn µÄ¶¯»úÕýÊÇÔ´
-ÓÚÕâÖÖÌåÑ飬ϣÍûÎÒÃǵŤ×÷Äܹ»Èñ¾ÎĸüºÃµÄ·¢»ÓÆäÓ¦ÓеÄ×÷Óá£TUTORIAL.zh
-µÄÒëÎÄÖÊÁ¿ºÜ¸ß£¬ÔÚ·­Òë¹ý³ÌÖиøÓè¹ýÎÒÃǺܶà½è¼øºÍ²Î¿¼£¬Ôڴ˶ÔÁõÕѺêµÄ¹¤×÷
+²»½öÔÚÓôÊÏ°¹ßÉÏÓÐËù²»Í¬£¬¸üÓÐÖî¶à±í´ï·½Ê½Óë¾ä·¨·½ÃæµÄ²îÒ죬Òò´ËÒ»Ö±ÒÔÀ´
+Óû§Ê¹Óà TUTORIAL.cn ¶¼»áÂÔ¾õÉúÓ²ºÍ»Þɬ¡£Õâ´ÎÖØз­Òë TUTORIAL.cn µÄ¶¯»ú
+ÕýÊÇÔ´ÓÚÕâÖÖÌåÑ飬ϣÍûÎÒÃǵŤ×÷Äܹ»Èñ¾ÎĸüºÃµØ·¢»ÓÆä×÷Óá£TUTORIAL.zh
+µÄÒëÎÄÖÊÁ¿ºÜ¸ß£¬ÔÚ·­Òë¹ý³ÌÖиøÓè¹ýÎÒÃÇÐí¶à½è¼øºÍ²Î¿¼£¬Ôڴ˶ÔÁõÕѺêµÄ¹¤×÷
 ±íʾ¸Ðл¡£
 
 ·­Òë¹ý³ÌÖÐ×î´óµÄÌôսĪ¹ýÓÚÊõÓïÒë´ÊµÄÑ¡ÔñÁË¡£¾­¹ýˮľÉçÇø Emacs °åÈÈÐÄÍø
@@ -954,6 +954,10 @@ Emacs ¿ìËÙÖ¸ÄÏ£¨Tutorial£©ÔçÓÐÁ½¸öÁõÕѺêµÄÖÐÎÄÒë±¾£¬·±¼ò¸÷Ò»¡£Æä¼òÌå°æ±¾
     Öеġ°window¡±¾ÍÖ»ÄÜÒë³É¡°´°¸ñ¡±ÁË¡£ÎÒÃÇÈÏΪ Emacs ÖÐ window ºÍ
     frame µÄ¹ØϵÓô°¸ñºÍ´°¿ÚÀ´Àà±ÈÊÇÊ®·ÖÐÎÏóµÄ¡£
 
+    ¡¶Ñ§Ï°GNU Emacs¡·£¨µÚ¶þ°æ£©Ò»Êé¶Ô¡°window¡±ºÍ¡°frame¡±µÄ·­ÒëÓë±¾½Ì³Ì
+    ¸ÕºÃÏà·´£¨·Ö±ðÒë×÷¡°´°¿Ú¡±ºÍ¡°´°¸ñ¡±£©¡£ÔÚ´ËÌرð×¢Ã÷£¬ÒÔÏû³ý¿ÉÄܲúÉú
+    µÄÒÉ»ó¡£
+
 [2] ¶ÔÓÚ¡°delete¡±ºÍ¡°kill¡±µÄÇø±ð£¬ÕýÎÄÒѾ­¸ø³öÁËÏêϸµÄ˵Ã÷¡£¡°É¾³ý¡±ºÍ
     ¡°ÒƳý¡±Ïà±È½ÏÆðÀ´£¬Ç°Õ߸ü¶àµØÒþº¬×Å¡°ÆÆ»µ¡±ºÍ¡°²»¿É»Ö¸´¡±µÄÒâ˼£¬¶ø
     ºóÕ߸ü¶àµØÒþº¬×Å¡°±»×ªÒÆ¡±ºÍ¡°¿É»Ö¸´¡±µÄÒâ˼¡£Òò´Ë·Ö±ðÑ¡ÔñËüÃÇ×÷ΪÉÏ
diff --git a/etc/TUTORIAL.de b/etc/TUTORIAL.de
index 4ccdd88523c..c181d596065 100644
--- a/etc/TUTORIAL.de
+++ b/etc/TUTORIAL.de
@@ -285,8 +285,8 @@ sein.  Wollen Sie ihn nach unten verschieben, dann geben Sie M-v mit
 einem numerischen Argument ein.
 
 Wenn Sie eine graphische Oberfläche wie X oder MS-Windows verwenden,
-dann befindet sich ein schmaler, langgezogener rechteckiger Bereich im
-Regelfall auf der linken Seite des Emacs-Fensters.  Dieser Bereich
+dann befindet sich ein schmaler, langgezogener rechteckiger Bereich auf
+der linken oder rechten Seite des Emacs-Fensters.  Dieser Bereich
 wird Scrollbar genannt (`Verschiebungsbalken').  Sie können Text
 verschieben, indem Sie mit der Maus auf den Scrollbar klicken.
 
diff --git a/etc/TUTORIAL.it b/etc/TUTORIAL.it
index 46388e78cc3..84e10878fa8 100644
--- a/etc/TUTORIAL.it
+++ b/etc/TUTORIAL.it
@@ -219,9 +219,9 @@ La schermata si sposta di 8 righe verso l'alto.  Se vuoi tornare di nuovo
 in basso puoi usare un argomento numerico con M-v.
 
 Quando si usa un sistema a finestre, come X11 o MS-Windows, ci dovrebbe
-essere un'area rettangolare allungata chiamata barra di scorrimento sul
-lato sinistro della finestra di Emacs.  Si può far scorrere il testo con
-un click del mouse nella barra di scorrimento.
+essere un'area rettangolare allungata chiamata barra di scorrimento a
+un lato della finestra di Emacs.  Si può far scorrere il testo con un 
+click del mouse nella barra di scorrimento.
 
 >> Prova a premere il pulsante centrale del mouse sopra all'area
    evidenziata nella barra di scorrimento.  Verrà visualizzata una parte
diff --git a/etc/TUTORIAL.sl b/etc/TUTORIAL.sl
index 52d2d18766c..3cb38ace65b 100644
--- a/etc/TUTORIAL.sl
+++ b/etc/TUTORIAL.sl
@@ -222,7 +222,7 @@ To bi moralo zaslon premakniti navzgor za osem vrstic. Èe bi ga radi
 premaknili nazaj, poskusite M-v z istim argumentom.
 
 Èe uporabljate grafièni vmesnik, denimo X11 ali MS Windows, imate
-verjetno ob levem robu Emacsovega okna navpièno pravokotno ploskev,
+verjetno ob robu Emacsovega okna navpièno pravokotno ploskev,
 imenovano drsnik. Pogled na besedilo lahko premikate tudi tako, da z
 mi¹ko kliknete na drsnik.
 
diff --git a/etc/TUTORIAL.sv b/etc/TUTORIAL.sv
index a2e0cd9abea..732d1fa397e 100644
--- a/etc/TUTORIAL.sv
+++ b/etc/TUTORIAL.sv
@@ -224,7 +224,7 @@ Detta borde ha flyttat skärmbilden 8 rader uppåt. Om du önskar flytta
 tillbaka igen är det bara att ge samma argument till M-v.
 
 Om du använder Emacs under ett fönstersystem, som X11 eller
-MS-Windows, finns det troligen ett rektangulärt område på vänster sida
+MS-Windows, finns det troligen ett rektangulärt område på sidan
 av Emacs-fönstret, en så kallad rullningslist. Genom att klicka i den
 med musen kan du rulla texten.
 
diff --git a/etc/emacs.py b/etc/emacs.py
index 9538b0b7127..7614f0927df 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -1,7 +1,7 @@
 """Definitions used by commands sent to inferior Python in python.el."""
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
-# Author: Dave Love <d.love@dl.ac.uk>
+# Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+# Author: Dave Love <fx@gnu.org>
 
 # This file is part of GNU Emacs.
 
@@ -20,17 +20,19 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-import os, sys, traceback, inspect, rlcompleter, __main__
+import os, sys, traceback, inspect, __main__
+from sets import Set
 
-__all__ = ["eexecfile", "args", "complete", "ehelp", "eimport"]
+__all__ = ["eexecfile", "eargs", "complete", "ehelp", "eimport", "modpath"]
 
 def eexecfile (file):
     """Execute FILE and then remove it.
+    Execute the file within the __main__ namespace.
     If we get an exception, print a traceback with the top frame
-    (oursleves) excluded."""
+    (ourselves) excluded."""
     try:
-        try: execfile (file, globals (), globals ())
-        except:
+       try: execfile (file, __main__.__dict__)
+       except:
             (type, value, tb) = sys.exc_info ()
             # Lose the stack frame for this location.
             tb = tb.tb_next
@@ -40,9 +42,10 @@ def eexecfile (file):
     finally:
         os.remove (file)
 
-def eargs (name):
+def eargs (name, imports):
     "Get arglist of NAME for Eldoc &c."
     try:
+        if imports: exec imports
         parts = name.split ('.')
         if len (parts) > 1:
             exec 'import ' + parts[0] # might fail
@@ -56,8 +59,7 @@ def eargs (name):
             return
         if inspect.ismethod (func):
             func = func.im_func
-        if not inspect.isfunction (func):
-            return
+        if not inspect.isfunction (func): return
         (args, varargs, varkw, defaults) = inspect.getargspec (func)
         # No space between name and arglist for consistency with builtins.
         print '_emacs_out', \
@@ -65,41 +67,109 @@ def eargs (name):
                                                    defaults)
     except: pass
 
-def complete (text, namespace = None):
+def all_names (object):
+    """Return (an approximation to) a list of all possible attribute
+    names reachable via the attributes of OBJECT, i.e. roughly the
+    leaves of the dictionary tree under it."""
+
+    def do_object (object, names):
+        if inspect.ismodule (object):
+            do_module (object, names)
+        elif inspect.isclass (object):
+            do_class (object, names)
+        # Might have an object without its class in scope.
+        elif hasattr (object, '__class__'):
+            names.add ('__class__')
+            do_class (object.__class__, names)
+        # Probably not a good idea to try to enumerate arbitrary
+        # dictionaries...
+        return names
+
+    def do_module (module, names):
+        if hasattr (module, '__all__'): # limited export list
+            names.union_update (module.__all__)
+            for i in module.__all__:
+                do_object (getattr (module, i), names)
+        else:                   # use all names
+            names.union_update (dir (module))
+            for i in dir (module):
+                do_object (getattr (module, i), names)
+        return names
+
+    def do_class (object, names):
+        ns = dir (object)
+        names.union_update (ns)
+        if hasattr (object, '__bases__'): # superclasses
+            for i in object.__bases__: do_object (i, names)
+        return names
+
+    return do_object (object, Set ([]))
+
+def complete (name, imports):
     """Complete TEXT in NAMESPACE and print a Lisp list of completions.
-    NAMESPACE is currently not used."""
-    if namespace is None: namespace = __main__.__dict__
-    c = rlcompleter.Completer (namespace)
+    Exec IMPORTS first."""
+    import __main__, keyword
+
+    def class_members(object):
+        names = dir (object)
+        if hasattr (object, '__bases__'):
+            for super in object.__bases__:
+                names = class_members (super)
+        return names    
+
+    names = Set ([])
+    base = None
     try:
-        if '.' in text:
-            matches = c.attr_matches (text)
-        else:
-            matches = c.global_matches (text)
-        print '_emacs_out (',
-        for elt in matches:
-            print '"%s"' % elt,
-        print ')'
-    except:
-        print '_emacs_out ()'
+        dict = __main__.__dict__.copy()
+        if imports: exec imports in dict
+        l = len (name)
+        if not "." in name:
+            for list in [dir (__builtins__), keyword.kwlist, dict.keys()]:
+                for elt in list:
+                    if elt[:l] == name: names.add(elt)
+        else:
+            base = name[:name.rfind ('.')]
+            name = name[name.rfind('.')+1:]
+            try:
+                object = eval (base, dict)
+                names = Set (dir (object))
+                if hasattr (object, '__class__'):
+                    names.add('__class__')
+                    names.union_update (class_members (object))
+            except: names = all_names (dict)
+    except: return []
+    l = len(name)
+    print '_emacs_out (',
+    for n in names:
+        if name == n[:l]:
+            if base: print '"%s.%s"' % (base, n),
+            else: print '"%s"' % n,
+    print ')'
 
-def ehelp (name, g, l):
-    """Get help on string NAME using globals G and locals L.
+def ehelp (name, imports):
+    """Get help on string NAME.
     First try to eval name for, e.g. user definitions where we need
     the object.  Otherwise try the string form."""
-    try: help (eval (name, g, l))
+    locls = {}
+    if imports:
+        try: exec imports in locls
+        except: pass
+    try: help (eval (name, globals(), locls))
     except: help (name)
 
 def eimport (mod, dir):
     """Import module MOD with directory DIR at the head of the search path.
     NB doesn't load from DIR if MOD shadows a system module."""
+    from __main__ import __dict__
+
     path0 = sys.path[0]
     sys.path[0] = dir
     try:
         try:
-            if globals().has_key(mod) and inspect.ismodule (eval (mod)):
-                reload(eval (mod))
+            if __dict__.has_key(mod) and inspect.ismodule (__dict__[mod]):
+                reload (__dict__[mod])
             else:
-                globals ()[mod] = __import__ (mod)
+                __dict__[mod] = __import__ (mod)
         except:
             (type, value, tb) = sys.exc_info ()
             print "Traceback (most recent call last):"
@@ -107,6 +177,17 @@ def eimport (mod, dir):
     finally:
         sys.path[0] = path0
 
-print '_emacs_ok'               # ready for input and can call continuation
+def modpath (module):
+    """Return the source file for the given MODULE (or None).
+Assumes that MODULE.py and MODULE.pyc are in the same directory."""
+    try:
+        path = __import__ (module).__file__
+        if path[-4:] == '.pyc' and os.path.exists (path[0:-1]):
+            path = path[:-1]
+        print "_emacs_out", path
+    except:
+        print "_emacs_out ()"
+
+# print '_emacs_ok'             # ready for input and can call continuation
 
 # arch-tag: d90408f3-90e2-4de4-99c2-6eb9c7b9ca46
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 951d0167c2e..ef2e847b5f1 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.43}
+\def\orgversionnumber{4.44}
 \def\year{2006}
 %
 %**start of header