[Emacs-diffs] /srv/bzr/emacs/trunk r106757: Updates to misc.texi in Emacs manual.

[Chong Yidong]

------------------------------------------------------------
revno: 106757
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-01-01 16:21:38 +0800
message:
  Updates to misc.texi in Emacs manual.
  
  * misc.texi (Gnus, Buffers of Gnus): Copyedits.
  (Gnus Startup): Note that the system might not be set up for news.
  Describe group levels more clearly.
  (Gnus Group Buffer, Gnus Summary Buffer): New nodes, split from
  Summary of Gnus.
  (Document View): Copyedits.  Move zoom commads to DocView
  Navigation node.
  (DocView Navigation, DocView Searching, DocView Slicing)
  (DocView Conversion): Nodes renamed from Navigation, etc.
  
  * sending.texi (Mail Sending): Add message-kill-buffer-on-exit.
modified:
  admin/FOR-RELEASE
  doc/emacs/ChangeLog
  doc/emacs/emacs.texi
  doc/emacs/misc.texi
  doc/emacs/sending.texi

=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2011-12-30 10:19:42 +0000
+++ b/admin/FOR-RELEASE 2012-01-01 08:21:38 +0000
@@ -154,7 +154,6 @@
 kmacro.texi       cyd
 macos.texi        
 maintaining.texi  cyd
-major.texi        
 mark.texi         cyd
 mini.texi         
 misc.texi         

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-12-31 11:33:09 +0000
+++ b/doc/emacs/ChangeLog       2012-01-01 08:21:38 +0000
@@ -1,3 +1,17 @@
+2012-01-01  Chong Yidong  <address@hidden>
+
+       * misc.texi (Gnus, Buffers of Gnus): Copyedits.
+       (Gnus Startup): Note that the system might not be set up for news.
+       Describe group levels more clearly.
+       (Gnus Group Buffer, Gnus Summary Buffer): New nodes, split from
+       Summary of Gnus.
+       (Document View): Copyedits.  Move zoom commads to DocView
+       Navigation node.
+       (DocView Navigation, DocView Searching, DocView Slicing)
+       (DocView Conversion): Nodes renamed from Navigation, etc.
+
+       * sending.texi (Mail Sending): Add message-kill-buffer-on-exit.
+
 2011-12-31  Eli Zaretskii  <address@hidden>
 
        * basic.texi (Moving Point): Fix the description of C-n and C-p.

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2011-12-31 01:27:15 +0000
+++ b/doc/emacs/emacs.texi      2012-01-01 08:21:38 +0000
@@ -919,10 +919,10 @@
 
 Document Viewing
 
-* Navigation::  Navigation inside DocView buffers.
-* Searching::   Searching inside documents.
-* Slicing::     Specifying which part of pages should be displayed.
-* Conversion::  Influencing and triggering conversion.
+* DocView Navigation::  Navigating DocView buffers.
+* DocView Searching::   Searching inside documents.
+* DocView Slicing::     Specifying which part of a page is displayed.
+* DocView Conversion::  Influencing and triggering conversion.
 
 Sending Mail
 
@@ -974,7 +974,8 @@
 
 * Buffers of Gnus::     The group, summary, and article buffers.
 * Gnus Startup::        What you should know about starting Gnus.
-* Summary of Gnus::     A short description of the basic Gnus commands.
+* Gnus Group Buffer::   A short description of Gnus group commands.
+* Gnus Summary Buffer:: A short description of Gnus summary commands.
 
 Running Shell Commands from Emacs
 

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2011-11-16 17:47:25 +0000
+++ b/doc/emacs/misc.texi       2012-01-01 08:21:38 +0000
@@ -6,7 +6,7 @@
 @chapter Miscellaneous Commands
 
   This chapter contains several brief topics that do not fit anywhere
-else: viewing ``document files'', reading netnews, running shell
+else: viewing ``document files'', reading Usenet news, running shell
 commands and shell subprocesses, using a single shared Emacs for
 utilities that expect to run an editor as a subprocess, printing
 hardcopy, sorting text, narrowing display to part of the buffer,
@@ -23,12 +23,13 @@
 @node Gnus
 @section Gnus
 @cindex Gnus
address@hidden reading netnews
address@hidden Usenet news
address@hidden newsreader
 
-Gnus is an Emacs package primarily designed for reading and posting
-Usenet news.  It can also be used to read and respond to messages from a
-number of other sources---mail, remote directories, digests, and so on.
-Here we introduce Gnus and describe several basic features.
+  Gnus is an Emacs package primarily designed for reading and posting
+Usenet news.  It can also be used to read and respond to messages from
+a number of other sources---email, remote directories, digests, and so
+on.  Here we introduce Gnus and describe several basic features.
 @ifnottex
 For full details, see @ref{Top, Gnus,, gnus, The Gnus Manual}.
 @end ifnottex
@@ -37,198 +38,216 @@
 manual.
 @end iftex
 
address@hidden gnus
-To start Gnus, type @kbd{M-x gnus @key{RET}}.
-
 @menu
 * Buffers of Gnus::     The group, summary, and article buffers.
 * Gnus Startup::        What you should know about starting Gnus.
-* Summary of Gnus::     A short description of the basic Gnus commands.
+* Gnus Group Buffer::   A short description of Gnus group commands.
+* Gnus Summary Buffer:: A short description of Gnus summary commands.
 @end menu
 
 @node Buffers of Gnus
 @subsection Gnus Buffers
 
-Unlike most Emacs packages, Gnus uses several buffers to display
-information and to receive commands.  The three Gnus buffers users use
-most are the @dfn{group buffer}, the @dfn{summary buffer} and the
address@hidden buffer}.
-
-The @dfn{group buffer} contains a list of newsgroups.  This is the
-first buffer Gnus displays when it starts up.  It normally displays
-only the groups to which you subscribe and that contain unread
-articles.  Use this buffer to select a specific group.
-
-The @dfn{summary buffer} lists one line for each article in a single
-group.  By default, the author, the subject and the line number are
-displayed for each article, but this is customizable, like most aspects
-of Gnus display.  The summary buffer is created when you select a group
-in the group buffer, and is killed when you exit the group.  Use this
-buffer to select an article.
-
-The @dfn{article buffer} displays the article.  In normal Gnus usage,
-you see this buffer but you don't select it---all useful
-article-oriented commands work in the summary buffer.  But you can
-select the article buffer, and execute all Gnus commands from that
-buffer, if you want to.
+  Gnus uses several buffers to display information and to receive
+commands.  The three most commonly-used Gnus buffers are the
address@hidden buffer}, the @dfn{summary buffer} and the @dfn{article
+buffer}.
+
+  The @dfn{group buffer} contains a list of article sources (e.g.@:
+newsgroups and email inboxes), which are collectively referred to as
address@hidden  This is the first buffer Gnus displays when it starts
+up.  It normally displays only the groups to which you subscribe and
+that contain unread articles.  From this buffer, you can select a
+group to read.
+
+  The @dfn{summary buffer} lists the articles in a single group,
+showing one article per line.  By default, it displays each article's
+author, subject, and line
address@hidden
+number.
address@hidden iftex
address@hidden
+number, but this is customizable; @xref{Summary Buffer Format,,, gnus,
+The Gnus Manual}.
address@hidden ifnottex
+The summary buffer is created when you select a group in the group
+buffer, and is killed when you exit the group.
+
+  From the summary buffer, you can choose an article to view.  The
+article is displayed in the @dfn{article buffer}.  In normal Gnus
+usage, you view this buffer but do not select it---all useful Gnus
+commands can be invoked from the summary buffer.  But you can select
+the article buffer, and execute Gnus commands from it, if you wish.
 
 @node Gnus Startup
 @subsection When Gnus Starts Up
 
-At startup, Gnus reads your @file{.newsrc} news initialization file
-and attempts to communicate with the local news server, which is a
-repository of news articles.  The news server need not be the same
-computer you are logged in on.
-
-If you start Gnus and connect to the server, but do not see any
-newsgroups listed in the group buffer, type @kbd{L} or @kbd{A k} to get
-a listing of all the groups.  Then type @kbd{u} to toggle
-subscription to groups.
-
-The first time you start Gnus, Gnus subscribes you to a few selected
-groups.  All other groups start out as @dfn{killed groups} for you; you
-can list them with @kbd{A k}.  All new groups that subsequently come to
-exist at the news server become @dfn{zombie groups} for you; type @kbd{A
-z} to list them.  You can subscribe to a group shown in these lists
-using the @kbd{u} command.
-
-When you quit Gnus with @kbd{q}, it automatically records in your
address@hidden and @file{.newsrc.eld} initialization files the
-subscribed or unsubscribed status of all groups.  You should normally
-not edit these files manually, but you may if you know how.
-
address@hidden Summary of Gnus
address@hidden Summary of Gnus Commands
-
-Reading news is a two-step process:
-
address@hidden
address@hidden
-Choose a group in the group buffer.
-
address@hidden
-Select articles from the summary buffer.  Each article selected is
-displayed in the article buffer in a large window, below the summary
-buffer in its small window.
address@hidden enumerate
-
-  Each Gnus buffer has its own special commands; the meanings of any
-given key in the various Gnus buffers are usually analogous, even if
-not identical.  Here are commands for the group and summary buffers:
address@hidden gnus
address@hidden @file{.newsrc} file
+  If your system has been set up for reading Usenet news, getting
+started with Gnus is easy---just type @kbd{M-x gnus}.
+
+  On starting up, Gnus reads your @dfn{news initialization file}: a
+file named @file{.newsrc} in your home directory which lists your
+Usenet newsgroups and subscriptions (this file is not unique to Gnus;
+it is used by many other newsreader programs).  It then tries to
+contact the system's default news server, which is typically specified
+by the @samp{NNTPSERVER} environment variable.
+
+  If your system does not have a default news server, or if you wish
+to use Gnus for reading email, then before invoking @kbd{M-x gnus} you
+need to tell Gnus where to get news and/or mail.  To do this,
+customize the variables @code{gnus-select-method} and/or
address@hidden
address@hidden
+See the Gnus manual for details.
address@hidden iftex
address@hidden
address@hidden the News,,, gnus, The Gnus Manual}.
address@hidden ifnottex
+
+  Once Gnus has started up, it displays the group buffer.  By default,
+the group buffer shows only a small number of @dfn{subscribed groups}.
+Groups with other address@hidden, @dfn{killed}, or
address@hidden hidden.  The first time you start Gnus, any group
+to which you are not subscribed is made into a killed group; any group
+that subsequently appears on the news server becomes a zombie group.
+
+  To proceed, you must select a group in the group buffer to open the
+summary buffer for that group; then, select an article in the summary
+buffer to view its article buffer in a separate window.  The following
+sections explain how to use the group and summary buffers to do this.
+
+  To quit Gnus, type @kbd{q} in the group buffer.  This automatically
+records your group statuses in the files @file{.newsrc} and
address@hidden, so that they take effect in subsequent Gnus
+sessions.
+
address@hidden Gnus Group Buffer
address@hidden Using the Gnus Group Buffer
+
+  The following commands are available in the Gnus group buffer:
 
 @table @kbd
address@hidden q @r{(Gnus Group mode)}
address@hidden gnus-group-exit
address@hidden q
-In the group buffer, update your @file{.newsrc} initialization file
-and quit Gnus.
-
-In the summary buffer, exit the current group and return to the
-group buffer.  Thus, typing @kbd{q} twice quits Gnus.
-
address@hidden L @r{(Gnus Group mode)}
address@hidden gnus-group-list-all-groups
address@hidden L
-In the group buffer, list all the groups available on your news
-server (except those you have killed).  This may be a long list!
address@hidden SPC @r{(Gnus Group mode)}
address@hidden gnus-group-read-group
address@hidden @key{SPC}
+Switch to the summary buffer for the group on the current line.
 
 @kindex l @r{(Gnus Group mode)}
address@hidden A s @r{(Gnus Group mode)}
 @findex gnus-group-list-groups
 @item l
address@hidden A s
 In the group buffer, list only the groups to which you subscribe and
-which contain unread articles.
+which contain unread articles (this is the default listing).
+
address@hidden L @r{(Gnus Group mode)}
address@hidden A u @r{(Gnus Group mode)}
address@hidden gnus-group-list-all-groups
address@hidden L
address@hidden A u
+List all subscribed and unsubscribed groups, but not killed or zombie
+groups.
+
address@hidden A k @r{(Gnus Group mode)}
address@hidden gnus-group-list-all-groups
address@hidden A k
+List killed groups.
+
address@hidden A z @r{(Gnus Group mode)}
address@hidden gnus-group-list-all-groups
address@hidden A z
+List zombie groups.
 
 @kindex u @r{(Gnus Group mode)}
 @findex gnus-group-unsubscribe-current-group
 @cindex subscribe groups
 @cindex unsubscribe groups
 @item u
-In the group buffer, unsubscribe from (or subscribe to) the group listed
-in the line that point is on.  When you quit Gnus by typing @kbd{q},
-Gnus lists in your @file{.newsrc} file which groups you have subscribed
-to.  The next time you start Gnus, you won't see this group,
-because Gnus normally displays only subscribed-to groups.
+Toggle the subscription status of the group on the current line
+(i.e.@: turn a subscribed group into an unsubscribed group, or vice
+versa).  Invoking this on a killed or zombie group turns it into an
+unsubscribed group.
 
address@hidden C-k @r{(Gnus)}
address@hidden C-k @r{(Gnus Group mode)}
 @findex gnus-group-kill-group
 @item C-k
-In the group buffer, ``kill'' the current line's group---don't
-even list it in @file{.newsrc} from now on.  This affects future
-Gnus sessions as well as the present session.
-
-When you quit Gnus by typing @kbd{q}, Gnus writes information
-in the file @file{.newsrc} describing all newsgroups except those you
-have ``killed.''
-
address@hidden SPC @r{(Gnus)}
+Kill the group on the current line.  Killed groups are not recorded in
+the @file{.newsrc} file, and they are not shown in the @kbd{l} or
address@hidden listings.
+
address@hidden DEL @r{(Gnus Group mode)}
address@hidden @key{DEL}
+Move point to the previous group containing unread articles.
+
address@hidden n @r{(Gnus Group mode)}
address@hidden gnus-group-next-unread-group
address@hidden gnus-summary-next-unread-article
address@hidden n
+Move point to the next unread group.
+
address@hidden p @r{(Gnus Group mode)}
address@hidden gnus-group-prev-unread-group
address@hidden gnus-summary-prev-unread-article
address@hidden p
+Move point to the previous unread group.
+
address@hidden q @r{(Gnus Group mode)}
address@hidden gnus-group-exit
address@hidden q
+Update your Gnus settings, and quit Gnus.
address@hidden table
+
address@hidden Gnus Summary Buffer
address@hidden Using the Gnus Summary Buffer
+
+  The following commands are available in the Gnus summary buffer:
+
address@hidden @kbd
address@hidden SPC @r{(Gnus Summary mode)}
 @findex gnus-group-read-group
 @item @key{SPC}
-In the group buffer, select the group on the line under the cursor
-and display the first unread article in that group.
-
address@hidden 1000
-In the summary buffer,
-
address@hidden @bullet
address@hidden
-Select the article on the line under the cursor if none is selected.
-
address@hidden
-Scroll the text of the selected article (if there is one).
-
address@hidden
-Select the next unread article if at the end of the current article.
address@hidden itemize
-
-Thus, you can move through all the articles by repeatedly typing @key{SPC}.
-
address@hidden DEL @r{(Gnus)}
address@hidden @key{DEL}
-In the group buffer, move point to the previous group containing
-unread articles.
-
+If there is no article selected, select the article on the current
+line and display its article buffer.  Otherwise, try scrolling the
+selected article buffer in its window; on reaching the end of the
+buffer, select the next unread article.
+
+Thus, you can read through all articles by repeatedly typing
address@hidden
+
address@hidden DEL @r{(Gnus Summary mode)}
 @findex gnus-summary-prev-page
-In the summary buffer, scroll the text of the article backwards.
address@hidden @key{DEL}
+Scroll the text of the article backwards.
 
address@hidden n @r{(Gnus)}
address@hidden n @r{(Gnus Summary mode)}
 @findex gnus-group-next-unread-group
 @findex gnus-summary-next-unread-article
 @item n
-Move point to the next unread group, or select the next unread article.
+Select the next unread article.
 
address@hidden p @r{(Gnus)}
address@hidden p @r{(Gnus Summary mode)}
 @findex gnus-group-prev-unread-group
 @findex gnus-summary-prev-unread-article
 @item p
-Move point to the previous unread group, or select the previous
-unread article.
-
address@hidden C-n @r{(Gnus Group mode)}
address@hidden gnus-group-next-group
address@hidden C-p @r{(Gnus Group mode)}
address@hidden gnus-group-prev-group
address@hidden C-n @r{(Gnus Summary mode)}
address@hidden gnus-summary-next-subject
address@hidden C-p @r{(Gnus Summary mode)}
address@hidden gnus-summary-prev-subject
address@hidden C-n
address@hidden C-p
-Move point to the next or previous item, even if it is marked as read.
-This does not select the article or group on that line.
+Select the previous unread article.
 
 @kindex s @r{(Gnus Summary mode)}
 @findex gnus-summary-isearch-article
 @item s
-In the summary buffer, do an incremental search of the current text in
-the article buffer, just as if you switched to the article buffer and
-typed @kbd{C-s}.
+Do an incremental search on the selected article buffer, as if you
+switched to the buffer and typed @kbd{C-s} (@pxref{Incremental
+Search}).
 
 @kindex M-s @r{(Gnus Summary mode)}
 @findex gnus-summary-search-article-forward
 @item M-s @var{regexp} @key{RET}
-In the summary buffer, search forward for articles containing a match
-for @var{regexp}.
+Search forward for articles containing a match for @var{regexp}.
 
address@hidden q @r{(Gnus Summary mode)}
address@hidden q
+Exit the summary buffer and return to the group buffer.
 @end table
 
 @node Document View
@@ -244,64 +263,54 @@
 @cindex document viewer (DocView)
 @findex doc-view-mode
 
-DocView mode (@code{doc-view-mode}) is a viewer for DVI, PostScript
-(PS), PDF, OpenDocument, and Microsoft Office documents.  It provides
-features such as slicing, zooming, and searching inside documents.  It
-works by converting the document to a set of images using the
address@hidden (GhostScript) command and other external tools
address@hidden@code{gs} is a hard requirement.  For DVI files,
address@hidden or @code{dvipdfm} is needed.  For OpenDocument and
-Microsoft Office documents, the @code{unoconv} tool is needed.}, and
-displaying those images.
+  DocView mode is a major mode for viewing DVI, PostScript (PS), PDF,
+OpenDocument, and Microsoft Office documents.  It provides features
+such as slicing, zooming, and searching inside documents.  It works by
+converting the document to a set of images using the @command{gs}
+(GhostScript) command and other external tools @address@hidden is
+a hard requirement.  For DVI files, @code{dvipdf} or @code{dvipdfm} is
+needed.  For OpenDocument and Microsoft Office documents, the
address@hidden tool is needed.}, and displaying those images.
 
 @findex doc-view-toggle-display
 @findex doc-view-toggle-display
 @cindex doc-view-minor-mode
-  When you visit a document file with the exception of PostScript
-files, Emacs automatically switches to DocView mode if possible
address@hidden needed external tools for this document type have to be
-available, emacs needs to run in a graphical frame, and PNG image
-support has to be compiled into emacs.  If any of these requirements
-is not fulfilled, DocView falls back to an appropriate mode.}.  When
-you visit a PostScript file, Emacs switches to PS mode, a major mode
-for editing PostScript files as text; however, it also enables DocView
-minor mode, so you can type @kbd{C-c C-c} to view the document with
-DocView.  (PDF and DVI files, unlike PostScript files, are not usually
-human-editable.)  In either case, repeating @kbd{C-c C-c}
-(@code{doc-view-toggle-display}) toggles between DocView and the file
-text.
+  When you visit a document file that can be displayed with DocView
+mode, Emacs automatically uses DocView mode @footnote{The needed
+external tools for the document type must be available, and Emacs must
+be running in a graphical frame and have PNG image support.  If any of
+these requirements is not fulfilled, Emacs falls back to another major
+mode.}.  As an exception, when you visit a PostScript file, Emacs
+switches to PS mode, a major mode for editing PostScript files as
+text; however, it also enables DocView minor mode, so you can type
address@hidden C-c} to view the document with DocView.  In either DocView
+mode or DocView minor mode, repeating @kbd{C-c C-c}
+(@code{doc-view-toggle-display}) toggles between DocView and the
+underlying file contents.
 
-  You can explicitly toggle DocView mode with the command @code{M-x
-doc-view-mode}, and DocView minor mode with the command @code{M-x
+  You can explicitly enable DocView mode with the command @code{M-x
+doc-view-mode}.  You can toggle DocView minor mode with @code{M-x
 doc-view-minor-mode}.
 
   When DocView mode starts, it displays a welcome screen and begins
 formatting the file, page by page.  It displays the first page once
 that has been formatted.
 
address@hidden doc-view-enlarge
address@hidden doc-view-shrink
address@hidden doc-view-resolution
-  When in DocView mode, you can enlarge or shrink the document with
address@hidden (@code{doc-view-enlarge}) and @kbd{-}
-(@code{doc-view-shrink}).  To specify the default size for DocView,
-set or customize the variable @code{doc-view-resolution}.
-
   To kill the DocView buffer, type @kbd{k}
 (@code{doc-view-kill-proc-and-buffer}).  To bury it, type @kbd{q}
 (@code{quit-window}).
 
 @menu
-* Navigation::  Navigation inside DocView buffers.
-* Searching::   Searching inside documents.
-* Slicing::     Specifying which part of pages should be displayed.
-* Conversion::  Influencing and triggering conversion.
+* Navigation: DocView Navigation.  Navigating DocView buffers.
+* Searching: DocView Searching.    Searching inside documents.
+* Slicing: DocView Slicing.        Specifying which part of a page is 
displayed.
+* Conversion: DocView Conversion.  Influencing and triggering conversion.
 @end menu
 
address@hidden Navigation
address@hidden Navigation
address@hidden DocView Navigation
address@hidden DocView Navigation
 
-When in DocView mode, you can scroll the current page using the usual
+  In DocView mode, you can scroll the current page using the usual
 Emacs movement keys: @kbd{C-p}, @kbd{C-n}, @kbd{C-b}, @kbd{C-f}, and
 the arrow keys.
 
@@ -315,6 +324,10 @@
 
 @findex doc-view-next-page
 @findex doc-view-previous-page
address@hidden n @r{(DocView mode)}
address@hidden p @r{(DocView mode)}
address@hidden C-x ] @r{(DocView mode)}
address@hidden C-x [ @r{(DocView mode)}
   You can also display the next page by typing @kbd{n}, @key{next} or
 @kbd{C-x ]} (@code{doc-view-next-page}).  To display the previous
 page, type @kbd{p}, @key{prior} or @kbd{C-x [}
@@ -322,23 +335,38 @@
 
 @findex doc-view-scroll-up-or-next-page
 @findex doc-view-scroll-down-or-previous-page
-  The @key{SPC} (@code{doc-view-scroll-up-or-next-page}) key is a
-convenient way to advance through the document.  It scrolls within the
-current page or advances to the next.  @key{DEL} moves backwards in a
-similar way (@code{doc-view-scroll-down-or-previous-page}).
address@hidden SPC @r{(DocView mode)}
address@hidden DEL @r{(DocView mode)}
+  @key{SPC} (@code{doc-view-scroll-up-or-next-page}) is a convenient
+way to advance through the document.  It scrolls within the current
+page or advances to the next.  @key{DEL} moves backwards in a similar
+way (@code{doc-view-scroll-down-or-previous-page}).
 
 @findex doc-view-first-page
 @findex doc-view-last-page
 @findex doc-view-goto-page
address@hidden M-< @r{(DocView mode)}
address@hidden M-> @r{(DocView mode)}
   To go to the first page, type @kbd{M-<}
 (@code{doc-view-first-page}); to go to the last one, type @kbd{M->}
 (@code{doc-view-last-page}).  To jump to a page by its number, type
 @kbd{M-g M-g} or @kbd{M-g g} (@code{doc-view-goto-page}).
 
address@hidden Searching
address@hidden Searching
-
-While in DocView mode, you can search the file's text for a regular
address@hidden doc-view-enlarge
address@hidden doc-view-shrink
address@hidden doc-view-resolution
address@hidden + @r{(DocView mode)}
address@hidden - @r{(DocView mode)}
+  You can enlarge or shrink the document with @kbd{+}
+(@code{doc-view-enlarge}) and @kbd{-} (@code{doc-view-shrink}).  These
+commands work by reconverting the document at the new size.  To
+specify the default size for DocView, customize the variable
address@hidden
+
address@hidden DocView Searching
address@hidden DocView Searching
+
+  In DocView mode, you can search the file's text for a regular
 expression (@pxref{Regexps}).  The interface for searching is inspired
 by @code{isearch} (@pxref{Incremental Search}).
 
@@ -359,8 +387,8 @@
 argument; i.e., @kbd{C-u C-s} for a forward search or @kbd{C-u C-r}
 for a backward search.
 
address@hidden Slicing
address@hidden Slicing
address@hidden DocView Slicing
address@hidden DocView Slicing
 
 Documents often have wide margins for printing.  They are annoying
 when reading the document on the screen, because they use up screen
@@ -388,37 +416,33 @@
 (@code{doc-view-reset-slice}).  Then DocView shows the entire page
 including its entire margins.
 
address@hidden Conversion
address@hidden Conversion
address@hidden DocView Conversion
address@hidden DocView Conversion
 
 @vindex doc-view-cache-directory
 @findex doc-view-clear-cache
-For efficiency, DocView caches the images produced by @command{gs}.
+  For efficiency, DocView caches the images produced by @command{gs}.
 The name of this directory is given by the variable
 @code{doc-view-cache-directory}.  You can clear the cache directory by
 typing @code{M-x doc-view-clear-cache}.
 
 @findex doc-view-kill-proc
 @findex doc-view-kill-proc-and-buffer
-  To force a reconversion of the currently viewed document, type
address@hidden or @kbd{g} (@code{revert-buffer}).  To kill the converter
-process associated with the current buffer, type @kbd{K}
+  To force reconversion of the currently viewed document, type @kbd{r}
+or @kbd{g} (@code{revert-buffer}).  To kill the converter process
+associated with the current buffer, type @kbd{K}
 (@code{doc-view-kill-proc}).  The command @kbd{k}
 (@code{doc-view-kill-proc-and-buffer}) kills the converter process and
 the DocView buffer.
 
-  The zoom commands @kbd{+} (@code{doc-view-enlarge}) and @kbd{-}
-(@code{doc-view-shrink}) need to reconvert the document at the new
-size.  The current page is converted first.
-
 @node Shell
 @section Running Shell Commands from Emacs
 @cindex subshell
 @cindex shell commands
 
-  Emacs has commands for passing single command lines to inferior shell
-processes; it can also run a shell interactively with input and output
-to an Emacs buffer named @samp{*shell*} or run a shell inside a terminal
+  Emacs has commands for passing single command lines to shell
+subprocesses, and for running a shell interactively with input and
+output to an Emacs buffer, and for running a shell in a terminal
 emulator window.
 
 @table @kbd

=== modified file 'doc/emacs/sending.texi'
--- a/doc/emacs/sending.texi    2011-12-30 10:19:42 +0000
+++ b/doc/emacs/sending.texi    2012-01-01 08:21:38 +0000
@@ -328,11 +328,9 @@
 @node Mail Sending
 @subsection Mail Sending
 
-  There are two commands to send a message you have been editing:
-
 @table @kbd
 @item C-c C-c
-Send the message, and deselect the mail buffer (@code{message-send-and-exit}).
+Send the message, and bury the mail buffer (@code{message-send-and-exit}).
 @item C-c C-s
 Send the message, and leave the mail buffer selected (@code{message-send}).
 @end table
@@ -340,35 +338,24 @@
 @kindex C-c C-s @r{(Message mode)}
 @kindex C-c C-c @r{(Message mode)}
 @findex message-send
-  If you want to send a message and be done with it, type @kbd{C-c
-C-c} (@code{mail-send-and-exit}).  This sends the message and then
-either deletes the window or switches to another buffer.  It also
address@hidden message-kill-buffer-on-exit
+  The usual command to send a message is @kbd{C-c C-c}
+(@code{mail-send-and-exit}).  This sends the message and then
 ``buries'' the mail buffer, putting it at the lowest priority for
-reselection.  This is the usual command for sending a message.
+reselection.  If you want it to kill the mail buffer instead, change
+the variable @code{message-kill-buffer-on-exit} to @code{t}.
 
 @findex message-send-and-exit
   The command @kbd{C-c C-s} (@code{message-send}) sends the message
-and marks the mail buffer unmodified, but leaves the buffer selected.
-Use this command if you want to modify the message (perhaps with new
-recipients) and send it again.
+and leaves the buffer selected.  Use this command if you want to
+modify the message (perhaps with new recipients) and send it again.
 
 @vindex message-send-hook
-  Sending a message runs the hook @code{message-send-hook}.
-
-  In a file-visiting buffer, sending the message does not clear the
-modified flag, because only saving the file should do that.  Also, you
-don't get a warning if you try to send the same message twice.
-
address@hidden sendmail-coding-system
-  When you send a message containing address@hidden characters,
-they need to be encoded with a coding system (@pxref{Coding Systems}).
-Usually the coding system is specified automatically by your chosen
-language environment (@pxref{Language Environments}).  You can
-explicitly specify the coding system for outgoing mail by setting the
-variable @code{sendmail-coding-system} (@pxref{Recognize Coding}).  If
-the coding system thus determined does not handle the characters in a
-particular message, Emacs asks you to select the coding system to use,
-showing a list of possible coding systems.
+  Sending a message runs the hook @code{message-send-hook}.  It also
+marks the mail buffer as unmodified, except if the mail buffer is also
+a file-visiting buffer (in that case, only saving the file does that,
+and you don't get a warning if you try to send the same message
+twice).
 
 @cindex SMTP
 @cindex Feedmail
@@ -376,24 +363,23 @@
 @cindex Mailclient
 @vindex send-mail-function
   The variable @code{send-mail-function} controls how the message is
-delivered.  Its value should be a function, which can be one of the
-following:
+delivered.  Its value should be one of the following functions:
 
 @table @code
 @item sendmail-query-once
-This function queries for a delivery method (one of the other entries
-in this list), and uses that method for this message.  Then it saves
-the method to @code{send-mail-function}, so that the method is used
-for future deliveries.  This is the default, unless you have already
-configured the @code{smtpmail-send-it} method.
+Query for a delivery method (one of the other entries in this list),
+and use that method for this message; then save the method to
address@hidden, so that it is used for future deliveries.
+This is the default, unless you have already set the variables for
+sending mail via @code{smtpmail-send-it} (see below).
 
 @item smtpmail-send-it
-Send mail through an external mail host, such as your Internet service
-provider's outgoing SMTP mail server.  If you have not told Emacs how
-to contact the SMTP server, it prompts for this information (which is
-saved in the variables @code{smtpmail-smtp-server} and
address@hidden).  @xref{Top,,Emacs SMTP Library,
-smtpmail, Sending mail via SMTP}.
+Send mail using the through an external mail host, such as your
+Internet service provider's outgoing SMTP mail server.  If you have
+not told Emacs how to contact the SMTP server, it prompts for this
+information, which is saved in the variables
address@hidden and @code{smtpmail-auth-credentials}.
address@hidden,,Emacs SMTP Library, smtpmail, Sending mail via SMTP}.
 
 @item sendmail-send-it
 Send mail using the system's default @command{sendmail} program, or
@@ -410,6 +396,17 @@
 @file{feedmail.el} for details.
 @end table
 
address@hidden sendmail-coding-system
+  When you send a message containing address@hidden characters,
+they need to be encoded with a coding system (@pxref{Coding Systems}).
+Usually the coding system is specified automatically by your chosen
+language environment (@pxref{Language Environments}).  You can
+explicitly specify the coding system for outgoing mail by setting the
+variable @code{sendmail-coding-system} (@pxref{Recognize Coding}).  If
+the coding system thus determined does not handle the characters in a
+particular message, Emacs asks you to select the coding system to use,
+showing a list of possible coding systems.
+
 @node Header Editing
 @subsection Mail Header Editing