upstream

7 files changed, 69 insertions, 36 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 56958417300..5fba9eda3b0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-12  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+        * frames.texi (Frame Commands): Note that delete-other-frames only
+        deletes frames on current terminal.
+
+2011-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * sending.texi (Mail Misc): Document mail-add-attachment.
+
 2011-09-04  Eli Zaretskii  <eliz@gnu.org>
 
         * basic.texi (Inserting Text): Add index entries.  (Bug#9433)
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 328deaec357..8ca598c3348 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -448,17 +448,23 @@ terminal.
 @item C-x 5 1
 @kindex C-x 5 1
 @findex delete-other-frames
-Delete all frames except the selected one.
+Delete all frames on the current terminal, except the selected one.
 @end table
 
-  The @kbd{C-x 5 0} (@code{delete-frame}) command will never delete
-the last frame, to prevent you from losing the ability to interact
+  The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the
+last frame.  This prevents you from losing the ability to interact
 with the Emacs process.  Note that when Emacs is run as a daemon
 (@pxref{Emacs Server}), there is always a ``virtual frame'' that
 remains after all the ordinary, interactive frames are deleted.  In
 this case, @kbd{C-x 5 0} can delete the last interactive frame; you
 can use @command{emacsclient} to reconnect to the Emacs session.
 
+  The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes
+frames on the current terminal.  For example, if you call it from an X
+frame, it deletes the other frames on that X display; if the Emacs
+process has frames open on other X displays or text terminals, those
+are not deleted.
+
 @vindex focus-follows-mouse
   On X, you may have to tell Emacs how the window manager handles
 focus-switching between windows, in order for @kbd{C-x 5 o}
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 02857459cc1..50ec852d740 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -556,8 +556,8 @@ package, which provides more flexible citation
 @cindex Multipurpose Internet Mail Extensions
   You can @dfn{attach} a file to an outgoing message by typing
 @kbd{C-c C-a} (@code{mml-attach-file}) in the mail buffer.  Attaching
-is done using the MIME (Multipurpose Internet Mail Extensions)
-standard.
+is done using the Multipurpose Internet Mail Extensions
+(@acronym{MIME}) standard.
 
   The @code{mml-attach-file} command prompts for the name of the file,
 and for the attachment's @dfn{content type}, @dfn{description}, and
@@ -570,6 +570,13 @@ recipient will see a link to the attachment within the message body,
 or @samp{attachment}, which means the link will be separate from the
 body.
 
+@findex mail-add-attachment
+  The @code{mml-attach-file} command is specific to Message mode; in
+Mail mode use @kbd{mail-add-attachment} instead.  It will prompt only
+for the name of the file, and will determine the content type and the
+disposition automatically.  If you want to include some description of
+the attached file, type that in the message body.
+
   The actual contents of the attached file are not inserted into the
 mail buffer.  Instead, some placeholder text is inserted into the mail
 buffer, like this:
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3f52d684683..4873680d0a1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * processes.texi (Network Servers): Clarify what the process
+        buffer is used for (bug#9233).
+
 2011-08-30  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
         * lists.texi (Building Lists): Fix typo.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 5d5b11497f7..d4f8ee9708b 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1981,9 +1981,9 @@ not get a separate process buffer; otherwise, Emacs creates a new
 buffer for the purpose.  The buffer name is the server's buffer name
 or process name, concatenated with the client identification string.
 
-The server's process buffer value is never used directly by Emacs, but
-it is passed to the log function, which can log connections by
-inserting text there.
+The server's process buffer value is never used directly, but the log
+function can retrieve it and use it to log connections by inserting
+text there.
 
 @item
 The communication type and the process filter and sentinel are
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8260df911a8..9826523227c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
+        (Finding the News): Doc clarification.
+        (Terminology): Mention naming.
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi: Remove mentions of `recent', which are now obsolete.
+        (Interactive): Document `quiet'.
+
 2011-08-15  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
 
         * org.texi (Images in LaTeX export): rewrite.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 439ff7fbc55..59c39893c13 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1011,7 +1011,7 @@ The @code{gnus-select-method} variable says where Gnus should look for
 news.  This variable should be a list where the first element says
 @dfn{how} and the second element says @dfn{where}.  This method is your
 native method.  All groups not fetched with this method are
-foreign groups.
+secondary or foreign groups.
 
 For instance, if the @samp{news.somewhere.edu} @acronym{NNTP} server is where
 you want to get your daily dosage of news from, you'd say:
@@ -2983,7 +2983,7 @@ The available operators are @code{not}, @code{and} and @code{or}.
 Predicates include @code{tick}, @code{unsend}, @code{undownload},
 @code{unread}, @code{dormant}, @code{expire}, @code{reply},
 @code{killed}, @code{bookmark}, @code{score}, @code{save},
-@code{cache}, @code{forward}, @code{unseen} and @code{recent}.
+@code{cache}, @code{forward}, and @code{unseen}.
 
 @end table
 
@@ -3335,8 +3335,12 @@ List all groups with ticked articles (@code{gnus-group-list-ticked}).
 @item A /
 @kindex A / (Group)
 @findex gnus-group-list-limit
-List groups limited within the current selection
-(@code{gnus-group-list-limit}).
+Further limit groups within the current selection
+(@code{gnus-group-list-limit}).  If you've first limited to groups
+with dormant articles with @kbd{A ?}, you can then further limit with
+@kbd{A / c}, which will then limit to groups with cached articles,
+giving you the groups that have both dormant articles and cached
+articles.
 
 @item A f
 @kindex A f (Group)
@@ -6165,18 +6169,9 @@ religiously) are marked with an @samp{S} in the second column
 (@code{gnus-saved-mark}).
 
 @item
-@vindex gnus-recent-mark
-Articles that according to the server haven't been shown to the user
-before are marked with a @samp{N} in the second column
-(@code{gnus-recent-mark}).  Note that not all servers support this
-mark, in which case it simply never appears.  Compare with
-@code{gnus-unseen-mark}.
-
-@item
 @vindex gnus-unseen-mark
 Articles that haven't been seen before in Gnus by the user are marked
 with a @samp{.} in the second column (@code{gnus-unseen-mark}).
-Compare with @code{gnus-recent-mark}.
 
 @item
 @vindex gnus-downloaded-mark
@@ -22265,8 +22260,9 @@ is @code{t} by default.
 
 @item gnus-interactive-exit
 @vindex gnus-interactive-exit
-Require confirmation before exiting Gnus.  This variable is @code{t} by
-default.
+If non-@code{nil}, require a confirmation when exiting Gnus.  If
+@code{quiet}, update any active summary buffers automatically without
+querying.  The default value is @code{t}.
 @end table
 
 
@@ -27993,10 +27989,6 @@ non-@code{nil}, the summary buffer is shown and updated as it's being
 built.
 
 @item
-The new @code{recent} mark @samp{.} indicates newly arrived messages (as
-opposed to old but unread messages).
-
-@item
 Gnus supports RFC 2369 mailing list headers, and adds a number of
 related commands in mailing list groups.  @xref{Mailing List}.
 
@@ -28584,18 +28576,21 @@ confusing.
 @item native
 @cindex native
 Gnus will always use one method (and back end) as the @dfn{native}, or
-default, way of getting news.
+default, way of getting news.  Groups from the native select method
+have names like @samp{gnu.emacs.gnus}.
 
 @item foreign
 @cindex foreign
-You can also have any number of foreign groups active at the same time.
-These are groups that use non-native non-secondary back ends for getting
-news.
+You can also have any number of foreign groups active at the same
+time.  These are groups that use non-native non-secondary back ends
+for getting news.  Foreign groups have names like
+@samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
 
 @item secondary
 @cindex secondary
-Secondary back ends are somewhere half-way between being native and being
-foreign, but they mostly act like they are native.
+Secondary back ends are somewhere half-way between being native and
+being foreign, but they mostly act like they are native, but they, too
+have names like @samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
 
 @item article
 @cindex article
@@ -29572,9 +29567,9 @@ propagate the mark information to the server.
 marks (preserving all marks not mentioned).  @var{mark} is a list of
 marks; where each mark is a symbol.  Currently used marks are
 @code{read}, @code{tick}, @code{reply}, @code{expire}, @code{killed},
-@code{dormant}, @code{save}, @code{download}, @code{unsend},
-@code{forward} and @code{recent}, but your back end should, if
-possible, not limit itself to these.
+@code{dormant}, @code{save}, @code{download}, @code{unsend}, and
+@code{forward}, but your back end should, if possible, not limit
+itself to these.
 
 Given contradictory actions, the last action in the list should be the
 effective one.  That is, if your action contains a request to add the