Merge from origin/emacs-26

1fc98ed073 ; Spelling fix
bb396a369c Update Org to v9.1.6
fa582153f7 Use text-pixels values only when saving framesets (Bug#30141)
6b01b9475d Minor improvement in section "Pages" of the usere manual
e8c8bd3de2 Minor improvements in user manual
26b8b92e63 Improve the "Mark" chapter of the user manual
759569fe40 Improve the "Buffers" chapter of the user manual
c2e6d121ff * lisp/term.el (term-send-input): Fix text duplication in ...
854a1c0a61 Improve "Buffers" in the user manual

# Conflicts:
#	etc/NEWS

5 files changed, 57 insertions, 48 deletions

diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 47ac8d4b05c..f8c1856058a 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -81,7 +81,7 @@ Select the next buffer in the buffer list (@code{next-buffer}).
 @item C-u M-g M-g
 @itemx C-u M-g g
 Read a number @var{n} and move to line @var{n} in the most recently
-selected buffer other than the current buffer.
+selected buffer other than the current buffer, in another window.
 @end table
 
 @kindex C-x b
@@ -94,12 +94,12 @@ now displayed in any window.
 
   While entering the buffer name, you can use the usual completion and
 history commands (@pxref{Minibuffer}).  Note that @kbd{C-x b}, and
-related commands, use @dfn{permissive completion with confirmation} for
-minibuffer completion: if you type @key{RET} immediately after
-completing up to a nonexistent buffer name, Emacs prints
-@samp{[Confirm]} and you must type a second @key{RET} to submit that
-buffer name.  @xref{Completion Exit}, for details.  For other
-completion options and features, see @ref{Completion Options}.
+related commands, use @dfn{permissive completion with confirmation}
+for minibuffer completion: if you type @key{RET} when the minibuffer
+text names a nonexistent buffer, Emacs prints @samp{[Confirm]} and you
+must type a second @key{RET} to submit that buffer name.
+@xref{Completion Exit}, for details.  For other completion options and
+features, see @ref{Completion Options}.
 
   If you specify a buffer that does not exist, @kbd{C-x b} creates a
 new, empty buffer that is not visiting any file, and selects it for
@@ -124,18 +124,19 @@ direction.
 
 @kindex C-x 4 b
 @findex switch-to-buffer-other-window
-  To select a buffer in a window other than the current one, type
-@kbd{C-x 4 b} (@code{switch-to-buffer-other-window}).  This prompts
-for a buffer name using the minibuffer, displays that buffer in
-another window, and selects that window.
+  To select a buffer in a window other than the current one
+(@pxref{Windows}), type @kbd{C-x 4 b}
+(@code{switch-to-buffer-other-window}).  This prompts for a buffer
+name using the minibuffer, displays that buffer in another window, and
+selects that window.
 
 @kindex C-x 5 b
 @findex switch-to-buffer-other-frame
   Similarly, @kbd{C-x 5 b} (@code{switch-to-buffer-other-frame})
-prompts for a buffer name, displays that buffer in another frame, and
-selects that frame.  If the buffer is already being shown in a window
-on another frame, Emacs selects that window and frame instead of
-creating a new frame.
+prompts for a buffer name, displays that buffer in another frame
+(@pxref{Frames}), and selects that frame.  If the buffer is already
+being shown in a window on another frame, Emacs selects that window
+and frame instead of creating a new frame.
 
   @xref{Displaying Buffers}, for how the @kbd{C-x 4 b} and @kbd{C-x 5
 b} commands get the window and/or frame to display in.
@@ -219,7 +220,7 @@ unless they visit files: such buffers are used internally by Emacs.
 @table @kbd
 @item C-x C-q
 Toggle read-only status of buffer (@code{read-only-mode}).
-@item M-x rename-buffer @key{RET} @var{name} @key{RET}
+@item M-x rename-buffer @key{RET} @var{buffer} @key{RET}
 Change the name of the current buffer.
 @item M-x rename-uniquely
 Rename the current buffer by adding @samp{<@var{number}>} to the end.
@@ -234,8 +235,9 @@ Scroll through buffer @var{buffer}.  @xref{View Mode}.
 its contents are not allowed.  The mode line indicates read-only
 buffers with @samp{%%} or @samp{%*} near the left margin.  @xref{Mode
 Line}.  Read-only buffers are usually made by subsystems such as Dired
-and Rmail that have special commands to operate on the text; also by
-visiting a file whose access control says you cannot write it.
+and Rmail that have special commands to operate on the text.  Visiting
+a file whose access control says you cannot write it also makes the
+buffer read-only.
 
 @findex read-only-mode
 @vindex view-read-only
@@ -282,13 +284,13 @@ large number of buffers.  You may then find it convenient to @dfn{kill}
 the buffers you no longer need.  (Some other editors call this
 operation @dfn{close}, and talk about ``closing the buffer'' or
 ``closing the file'' visited in the buffer.)  On most operating
-systems, killing a buffer releases its space back to the operating
-system so that other programs can use it.  Here are some commands for
-killing buffers:
+systems, killing a buffer releases the memory Emacs used for the buffer
+back to the operating system so that other programs can use it.  Here
+are some commands for killing buffers:
 
 @table @kbd
-@item C-x k @var{bufname} @key{RET}
-Kill buffer @var{bufname} (@code{kill-buffer}).
+@item C-x k @var{buffer} @key{RET}
+Kill buffer @var{buffer} (@code{kill-buffer}).
 @item M-x kill-some-buffers
 Offer to kill each buffer, one by one.
 @item M-x kill-matching-buffers
@@ -307,7 +309,7 @@ confirm with @kbd{yes} before the buffer is killed.
 
 @findex kill-some-buffers
   The command @kbd{M-x kill-some-buffers} asks about each buffer, one
-by one.  An answer of @kbd{y} means to kill the buffer, just like
+by one.  An answer of @kbd{yes} means to kill the buffer, just like
 @code{kill-buffer}.  This command ignores buffers whose names begin
 with a space, which are used internally by Emacs.
 
@@ -335,7 +337,9 @@ all the unmodified buffers that you have not used for a long time.  An
 ordinary buffer is killed if it has not been displayed for three days;
 however, you can specify certain buffers that should never be killed
 automatically, and others that should be killed if they have been unused
-for a mere hour.
+for a mere hour.  These defaults, and other aspects of this command's
+behavior, can be controlled by customizing several options described
+in the doc string of @code{clean-buffer-list}.
 
 @cindex Midnight mode
 @vindex midnight-mode
@@ -410,7 +414,8 @@ Perform all flagged deletions and saves (@code{Buffer-menu-execute}).
 @findex Buffer-menu-unmark
 @kindex u @r{(Buffer Menu)}
 Remove all flags from the current line, and move down
-(@code{Buffer-menu-unmark}).
+(@code{Buffer-menu-unmark}).  With a prefix argument, moves up after
+removing the flags.
 
 @item @key{DEL}
 @findex Buffer-menu-backup-unmark
@@ -422,7 +427,9 @@ Move to the previous line and remove all flags on that line
 @findex Buffer-menu-unmark-all-buffers
 @kindex M-DEL @r{(Buffer Menu)}
 Remove a particular flag from all lines
-(@code{Buffer-menu-unmark-all-buffers}).
+(@code{Buffer-menu-unmark-all-buffers}).  This asks for a single
+character, and unmarks buffers marked with that character; typing
+@key{RET} removes all marks.
 
 @item U
 @findex Buffer-menu-unmark-all
@@ -432,8 +439,8 @@ Remove all flags from all the lines
 @end table
 
 @noindent
-The commands for adding or removing flags, @kbd{d}, @kbd{C-d}, @kbd{s}
-and @kbd{u}, all accept a numeric argument as a repeat count.
+The commands for removing flags, @kbd{d} and @kbd{C-d}, accept a
+numeric argument as a repeat count.
 
   The following commands operate immediately on the buffer listed on
 the current line.  They also accept a numeric argument as a repeat
@@ -505,7 +512,8 @@ selected in one, and a previously current buffer (aside from
 @item b
 @findex Buffer-menu-bury
 @kindex b @r{(Buffer Menu)}
-Bury this line's buffer (@code{Buffer-menu-bury}).
+Bury this line's buffer (@code{Buffer-menu-bury}) (i.e., move it to
+the end of the buffer list).
 
 @item m
 @findex Buffer-menu-mark
@@ -727,10 +735,10 @@ C-b}.  To customize this buffer list, use the @code{bs} Custom group
 @kindex C-Down-mouse-1
   MSB global minor mode (``MSB'' stands for ``mouse select buffer'')
 provides a different and customizable mouse buffer menu which you may
-prefer.  It replaces the bindings of @code{mouse-buffer-menu},
-normally on @kbd{C-Down-mouse-1} and @kbd{C-@key{F10}}, and the menu
-bar buffer menu.  You can customize the menu in the @code{msb} Custom
-group.
+prefer.  It replaces the @code{mouse-buffer-menu} commands, normally
+bound to @kbd{C-Down-mouse-1} and @kbd{C-@key{F10}}, with its own
+commands, and also modifies the menu-bar buffer menu.  You can
+customize the menu in the @code{msb} Custom group.
 
 @findex ibuffer
    IBuffer is a major mode for viewing a list of buffers and operating
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index c1932b682de..072a3bc4b11 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -135,10 +135,11 @@ detailed description of these mouse commands.
 typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}},
 @kbd{S-C-f}, @kbd{S-C-n}, etc.).  This is called @dfn{shift-selection}.
 It sets the mark at point before moving point, but only if there is no
-active mark set via shift-selection.  The mark set by mouse commands
-and by shift-selection behaves slightly differently from the usual
-mark: any subsequent unshifted cursor motion command deactivates it
-automatically.  For details, see @ref{Shift Selection}.
+active mark set via a previous shift-selection or mouse commands.  The
+mark set by mouse commands and by shift-selection behaves slightly
+differently from the usual mark: any subsequent unshifted cursor motion
+command deactivates it automatically.  For details, see @ref{Shift
+Selection}.
 
   Many commands that insert text, such as @kbd{C-y} (@code{yank}), set
 the mark at the other end of the inserted text, without activating it.
@@ -161,7 +162,7 @@ object such as a word, list, paragraph or page:
 
 @table @kbd
 @item M-@@
-Set mark after end of next word (@code{mark-word}).  This does not
+Set mark at the end of the next word (@code{mark-word}).  This does not
 move point.
 @item C-M-@@
 Set mark after end of following balanced expression
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 846d9fe8c62..b7659976a98 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -381,12 +381,13 @@ at the end).
   @kbd{C-x C-p C-w} is a handy way to kill a page to move it
 elsewhere.  If you move to another page delimiter with @kbd{C-x [} and
 @kbd{C-x ]}, then yank the killed page, all the pages will be properly
-delimited once again.  The reason @kbd{C-x C-p} includes only the
-following page delimiter in the region is to ensure that.
+delimited once again.  Making sure this works as expected is the
+reason @kbd{C-x C-p} includes only the following page delimiter in the
+region.
 
   A numeric argument to @kbd{C-x C-p} specifies which page to go to,
-relative to the current one.  Zero means the current page, one
-the next page, and @minus{}1 the previous one.
+relative to the current one.  Zero means the current page, one means
+the next page, and @minus{}1 means the previous one.
 
 @kindex C-x l
 @findex count-lines-page
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index dd9d088a56e..05114c376c9 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -452,7 +452,7 @@ displays, you can use the mouse to kill Emacs or switch to another
 program.
 
   On MS-DOS, you must type @kbd{C-@key{Break}} (twice) to cause
-emergency escape---but there are cases where it won't work, when
+emergency escape---but there are cases where it won't work, when a
 system call hangs or when Emacs is stuck in a tight loop in C code.
 
 @node Bugs
@@ -1225,8 +1225,7 @@ check if existing bug reports are fixed in newer versions of Emacs
 @url{https://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
 
 @item
-fix existing bug reports
-@url{https://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}.
+fix existing bug reports.
 
 @item
 @c etc/TODO not in WWW_GNU_ORG
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index f779417bd70..762dfafdda7 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4,8 +4,8 @@
 @settitle The Org Manual
 @include docstyle.texi
 
-@set VERSION 9.1.4
-@set DATE 2017-09-17
+@set VERSION 9.1.6
+@set DATE 2018-01-03
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}