Merge from origin/emacs-25

4af5981 Add a comment in generated refcards about the source
ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment.
4887e7c js-mode: Fix indent problem after a regexp
e992ac0 Fix sluggish display of symbols in UTF-8 language environment
1fc101b Don't confuse how Texinfo outputs @var with the input
91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
5b0cddd More fixes in copyright notices in etc/refcards/
f994c20 Update copyright text in refcards
9ad2ae7 Fix Outline command names
26c3554 Send text received by bracketed paste to process
db0b58d Correct the statement about programming modes always running ...
78aece4 Improve documentation of 'occur'
eb364fd Do call debugger on failed cl-assert
3ef4ee8 Avoid infloop in python
8da810f Don't refer to obsolete FEATURE-unload-hook
4f478ca Improve documentation of dabbrevs
7272e5d * lisp/chistory.el (list-command-history): Doc fix.  (Bug#24890)
89b7482 * lisp/simple.el (set-mark-command): Doc fix.  (Bug#24890)
3b199f7 Improve documentation of some Help commands
93d3a0e Fix documentation of yes-or-no prompts
af04919 Fix documentation of partial completion style
ed80184 Fix documentation of the mode line on emacsclient frames
e6be855 Fix description of 'C-z' in User manual
16f7007 Improve and clarify documentation of Outline Mode
31d93aa Add Emacs version number to nt/README.W32
0b6b815 Fix python-mode hideshow regexp
dc152c5 Modernize usage of 'macOS' in doc and comments
84c5343 Prefer comments /* like this */ in C code
bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
3ef86fd Clarify documentation of face attribute functions
de51d59 ; * nt/README.W32: Minor copyedits.
db436e9 Don't call debug on failed cl-assert

# Conflicts:
#	doc/emacs/cmdargs.texi
#	etc/NEWS
#	etc/PROBLEMS
#	lisp/auth-source.el
#	lisp/net/tramp-sh.el

29 files changed, 195 insertions, 167 deletions

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index a1db34cf0ee..227fe6f7ee2 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -341,7 +341,7 @@ abbrev expansion happens only when you request it explicitly.
 @table @kbd
 @item M-/
 Expand the word in the buffer before point as a @dfn{dynamic abbrev},
-by searching in the buffer for words starting with that abbreviation
+by searching for words starting with that abbreviation
 (@code{dabbrev-expand}).
 
 @item C-M-/
@@ -361,14 +361,19 @@ The variable @code{dabbrev-limit}, if non-@code{nil}, specifies how far
 away in the buffer to search for an expansion.
 
 @vindex dabbrev-check-all-buffers
+@vindex dabbrev-check-other-buffers
   After scanning the current buffer, @kbd{M-/} normally searches other
-buffers, unless you have set @code{dabbrev-check-all-buffers} to
-@code{nil}.
+buffers.  The variables @code{dabbrev-check-all-buffers} and
+@code{dabbrev-check-other-buffers} can be used to determine which
+other buffers, if any, are searched.
 
+@vindex dabbrev-ignored-buffer-names
 @vindex dabbrev-ignored-buffer-regexps
-  For finer control over which buffers to scan, customize the variable
-@code{dabbrev-ignored-buffer-regexps}.  Its value is a list of regular
-expressions.  If a buffer's name matches any of these regular
+  For finer control over which buffers to scan, customize the
+variables @code{dabbrev-ignored-buffer-names} and
+@code{dabbrev-ignored-buffer-regexps}.  The value of the former is a
+list of buffer names to skip.  The value of the latter is a list of
+regular expressions; if a buffer's name matches any of these regular
 expressions, dynamic abbrev expansion skips that buffer.
 
   A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 8d3d936b7b3..524cd8dd268 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -558,11 +558,11 @@ variables is not set, the category defaults to the value of the
 @env{LANG} is not set.  But if @env{LC_ALL} is specified, it overrides
 the settings of all the other locale environment variables.
 
-On MS-Windows and OS X, if @env{LANG} is not already set in the
+On MS-Windows and macOS, if @env{LANG} is not already set in the
 environment, Emacs sets it based on the system-wide default.  You can
 set this in the ``Regional Settings'' Control Panel on some versions
 of MS-Windows, and in the ``Language and Region'' System Preference on
-OS X.
+macOS.
 
 The value of the @env{LC_CTYPE} category is
 matched against entries in @code{locale-language-names},
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index 09331e80fb1..7f186cfafe5 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -100,7 +100,7 @@ display them initially.
 Kill Emacs (@code{save-buffers-kill-terminal}).
 @item C-z
 On a text terminal, suspend Emacs; on a graphical display,
-iconify (or ``minimize'') the selected frame (@code{suspend-emacs}).
+iconify (or ``minimize'') the selected frame (@code{suspend-frame}).
 @end table
 
 @kindex C-x C-c
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 4b7b7fc6315..64da8907172 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -411,8 +411,10 @@ Follow a hyperlink that you click on.
 Show all documentation about the symbol at point
 (@code{help-follow-symbol}).
 @item C-c C-f
+@itemx r
 Go forward to the next help topic (@code{help-go-forward}).
 @item C-c C-b
+@itemx l
 Go back to the previous help topic (@code{help-go-back}).
 @end table
 
@@ -422,15 +424,18 @@ Go back to the previous help topic (@code{help-go-back}).
 @findex help-go-forward
 @kindex RET @r{(Help mode)}
 @kindex C-c C-b @r{(Help mode)}
+@kindex l @r{(Help mode)}
 @kindex C-c C-f @r{(Help mode)}
+@kindex r @r{(Help mode)}
   When a function name, variable name, or face name (@pxref{Faces})
 appears in the documentation in the help buffer, it is normally an
 underlined @dfn{hyperlink}.  To view the associated documentation,
 move point there and type @key{RET} (@code{help-follow}), or click on
 the hyperlink with @kbd{mouse-1} or @kbd{mouse-2}.  Doing so replaces
 the contents of the help buffer; to retrace your steps, type @kbd{C-c
-C-b} (@code{help-go-back}).  While retracing your steps, you can go
-forward by using @kbd{C-c C-b} (@code{help-go-forward}).
+C-b} or @kbd{l} (@code{help-go-back}).  While retracing your steps,
+you can go forward by using @kbd{C-c C-f} or @kbd{r}
+(@code{help-go-forward}).
 
 @cindex URL, viewing in help
 @cindex help, viewing web pages
@@ -556,7 +561,8 @@ commands that you are not familiar with, you can use @kbd{C-h k} or
   Each Emacs major mode typically redefines a few keys and makes other
 changes in how editing works.  @kbd{C-h m} (@code{describe-mode})
 displays documentation on the current major mode, which normally
-describes the commands and features that are changed in this mode.
+describes the commands and features that are changed in this mode, and
+also its key bindings.
 
 @kindex C-h b
 @findex describe-bindings
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index b0597dc2499..6e6520b60bc 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -3,19 +3,19 @@
 @c See file emacs.texi for copying conditions.
 @node Mac OS / GNUstep
 @appendix Emacs and Mac OS / GNUstep
-@cindex Mac OS X
+@cindex macOS
 @cindex Macintosh
 @cindex GNUstep
 
   This section describes the peculiarities of using Emacs built with
 the GNUstep libraries on GNU/Linux or other operating systems, or on
-Mac OS X with native window system support.  On Mac OS X, Emacs can be
+macOS with native window system support.  On macOS, Emacs can be
 built either without window system support, with X11, or with the
 Cocoa interface; this section only applies to the Cocoa build.  This
-does not support versions of Mac OS X earlier than 10.6.
+does not support versions before Mac OS X 10.6.
 
   For various historical and technical reasons, Emacs uses the term
-@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
+@samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for
 instance, most of the commands and variables described in this section
 begin with @samp{ns-}, which is short for @samp{Nextstep}.  NeXTstep
 was an application interface released by NeXT Inc during the 1980s, of
@@ -84,7 +84,7 @@ set, which often causes the subprocesses it launches to behave differently than
 they would when launched from the shell.
 
 For the PATH and MANPATH variables, a system-wide method
-of setting PATH is recommended on Mac OS X, using the
+of setting PATH is recommended on macOS, using the
 @file{/etc/paths} files and the @file{/etc/paths.d} directory.
 
 @node Mac / GNUstep Customization
@@ -117,8 +117,8 @@ close the altered one.
 Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
-@cindex Core Text, on Mac OS X
-In Mac OS X, Emacs uses a Core Text based font backend
+@cindex Core Text, on macOS
+In macOS, Emacs uses a Core Text based font backend
 by default.  If you prefer the older font style, enter the following
 at the command-line before starting Emacs:
 
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index be4206cb60c..7c97e425713 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -469,8 +469,8 @@ separately.  (For example, when completing command names,
 @samp{em-l-m} completes to @samp{emacs-lisp-mode}.)
 
 Furthermore, a @samp{*} in the minibuffer text is treated as a
-@dfn{wildcard}---it matches any character at the corresponding
-position in the completion alternative.
+@dfn{wildcard}---it matches any string of characters at the
+corresponding position in the completion alternative.
 
 @item emacs22
 This completion style is similar to @code{basic}, except that it
@@ -788,8 +788,8 @@ File ‘foo.el’ exists; overwrite? (y or n)
 Because this query does not actually use the minibuffer, the usual
 minibuffer editing commands cannot be used.  However, you can perform
 some window scrolling operations while the query is active: @kbd{C-l}
-recenters the selected window; @kbd{M-v} (or @key{PageDown} or
-@key{next}) scrolls forward; @kbd{C-v} (or @key{PageUp}, or
+recenters the selected window; @kbd{C-v} (or @key{PageDown} or
+@key{next}) scrolls forward; @kbd{M-v} (or @key{PageUp}, or
 @key{prior}) scrolls backward; @kbd{C-M-v} scrolls forward in the next
 window; and @kbd{C-M-S-v} scrolls backward in the next window.  Typing
 @kbd{C-g} dismisses the query, and quits the command that issued it
@@ -811,5 +811,5 @@ Buffer foo.el modified; kill anyway? (yes or no)
 To answer, you must type @samp{yes} or @samp{no} into the minibuffer,
 followed by @key{RET}.  The minibuffer behaves as described in the
 previous sections; you can switch to another window with @kbd{C-x o},
-use the history commands @kbd{M-p} and @kbd{M-f}, etc.  Type @kbd{C-g}
+use the history commands @kbd{M-p} and @kbd{M-n}, etc.  Type @kbd{C-g}
 to quit the minibuffer and the querying command.
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index c1564e9299b..63e31ab568c 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -113,10 +113,13 @@ hook}, a customizable list of Lisp functions to run each time the mode
 is enabled in a buffer.  @xref{Hooks}, for more information about
 hooks.  Each mode hook is named after its major mode, e.g., Fortran
 mode has @code{fortran-mode-hook}.  Furthermore, all text-based major
-modes run @code{text-mode-hook}, and all programming language modes
-run @code{prog-mode-hook}, prior to running their own mode hooks.
-Hook functions can look at the value of the variable @code{major-mode}
-to see which mode is actually being entered.
+modes run @code{text-mode-hook}, and many programming language modes
+@footnote{More specifically, the modes which are ''derived'' from
+@code{prog-mode} (@pxref{Derived Modes,,, elisp, The Emacs Lisp
+Reference Manual}).} (including all those distributed with Emacs) run
+@code{prog-mode-hook}, prior to running their own mode hooks.  Hook
+functions can look at the value of the variable @code{major-mode} to
+see which mode is actually being entered.
 
   Mode hooks are commonly used to enable minor modes (@pxref{Minor
 Modes}).  For example, you can put the following lines in your init
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index a87561ccf18..2793bb944bc 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -366,7 +366,7 @@ Emulate @sc{gnu} systems; this is the default.  This sets
 Emulate Unix systems.  Like @code{GNU}, but sets
 @code{ls-lisp-verbosity} to @code{(links uid)}.
 @item MacOS
-Emulate MacOS@.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
+Emulate macOS@.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
 @code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}.
 @item MS-Windows
 Emulate MS-Windows.  Sets @code{ls-lisp-ignore-case} and
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index e735343cc75..882d75f5e61 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -745,7 +745,7 @@ exactly what to do for end-of-line conversion:
 @item @dots{}-unix
 Don't do any end-of-line conversion; assume the file uses
 newline to separate lines.  (This is the convention normally used
-on Unix and GNU systems, and Mac OS X.)
+on Unix and GNU systems, and macOS.)
 
 @item @dots{}-dos
 Assume the file uses carriage-return linefeed to separate lines, and do
@@ -757,8 +757,8 @@ Emacs doesn't support directly.})
 
 @item @dots{}-mac
 Assume the file uses carriage-return to separate lines, and do the
-appropriate conversion.  (This was the convention used on the
-Macintosh system prior to OS X.)
+appropriate conversion.  (This was the convention used in Classic Mac
+OS.)
 @end table
 
   These variant coding systems are omitted from the
@@ -1393,7 +1393,7 @@ of @code{standard-fontset-spec}.  This fontset's name is
 @noindent
 or just @samp{fontset-standard} for short.
 
-  On GNUstep and Mac OS X, the standard fontset is created using the value of
+  On GNUstep and macOS, the standard fontset is created using the value of
 @code{ns-standard-fontset-spec}, and on MS Windows it is
 created using the value of @code{w32-standard-fontset-spec}.
 
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index a8cf5e4a512..84f1296484a 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1425,7 +1425,7 @@ local mailbox.
 @end table
 
 @noindent
-@var{Proto} can be one of:
+@var{proto} can be one of:
 
 @table @code
 @item mbox
@@ -1434,12 +1434,12 @@ Usual Unix mailbox format.  In this case, neither @var{user} nor
 of the mailbox file, e.g., @code{mbox://var/spool/mail/smith}.
 
 @item mh
-A local mailbox in the @acronym{MH} format.  @var{User} and
-@var{pass} are not used.  @var{Host-or-file-name} denotes the name of
+A local mailbox in the @acronym{MH} format.  @var{user} and
+@var{pass} are not used.  @var{host-or-file-name} denotes the name of
 @acronym{MH} folder, e.g., @code{mh://Mail/inbox}.
 
 @item maildir
-A local mailbox in the @acronym{maildir} format.  @var{User} and
+A local mailbox in the @acronym{maildir} format.  @var{user} and
 @var{pass} are not used, and @var{host-or-file-name} denotes the name of
 @code{maildir} mailbox, e.g., @code{maildir://mail/inbox}.
 
@@ -1448,14 +1448,14 @@ Any local mailbox format.  Its actual format is detected automatically
 by @code{movemail}.
 
 @item pop
-A remote mailbox to be accessed via POP3 protocol.  @var{User}
+A remote mailbox to be accessed via POP3 protocol.  @var{user}
 specifies the remote user name to use, @var{pass} may be used to
 specify the user password, @var{host-or-file-name} is the name or IP
 address of the remote mail server to connect to; e.g.,
 @code{pop://smith:guessme@@remote.server.net}.
 
 @item imap
-A remote mailbox to be accessed via IMAP4 protocol.  @var{User}
+A remote mailbox to be accessed via IMAP4 protocol.  @var{user}
 specifies the remote user name to use, @var{pass} may be used to
 specify the user password, @var{host-or-file-name} is the name or IP
 address of the remote mail server to connect to;
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 716575706cf..46ccca52aa8 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -216,6 +216,11 @@ changes to either a forward slash (@samp{/}) or @samp{(Mac)}.  On some
 systems, Emacs displays @samp{(Unix)} instead of the colon for files
 that use newline as the line separator.
 
+  On frames created for @command{emacsclient} (@pxref{Invoking
+emacsclient}), the next character is @samp{@@}.  This indication is
+typical for frames of an Emacs process running as a daemon
+(@pxref{Emacs Server}).
+
   The next element on the mode line is the string indicated by
 @var{ch}.  This shows two dashes (@samp{--}) if the buffer displayed
 in the window has the same contents as the corresponding file on the
@@ -225,7 +230,7 @@ shows @samp{%*} if the buffer is modified, and @samp{%%} otherwise.
 
   The character after @var{ch} is normally a dash (@samp{-}).
 However, if the default-directory for the current buffer is on a
-remote machine, @samp{@@} is displayed instead (@pxref{File Names}).
+remote machine (@pxref{File Names}), @samp{@@} is displayed instead.
 
   @var{fr} gives the selected frame name (@pxref{Frames}).  It appears
 only on text terminals.  The initial frame's name is @samp{F1}.
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index b41214df1ae..543d5470046 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1714,15 +1714,21 @@ a multi-file incremental search is activated automatically.
 @cindex mode, Occur
 @cindex match (face name)
 @vindex list-matching-lines-default-context-lines
+@kindex M-s o
 @item M-x occur
+@itemx M-s o
 Prompt for a regexp, and display a list showing each line in the
-buffer that contains a match for it.  The text that matched is
-highlighted using the @code{match} face.  To limit the search to part
-of the buffer, narrow to that part (@pxref{Narrowing}).  A numeric
-argument @var{n} specifies that @var{n} lines of context are to be
-displayed before and after each matching line.  The default number of
-context lines is specified by the variable
-@code{list-matching-lines-default-context-lines}.
+buffer that contains a match for it.  If you type @kbd{M-n} at the
+prompt, you can reuse search strings from previous incremental
+searches.  The text that matched is highlighted using the @code{match}
+face.  To limit the search to part of the buffer, narrow to that part
+(@pxref{Narrowing}).  A numeric argument @var{n} specifies that
+@var{n} lines of context are to be displayed before and after each
+matching line.  The default number of context lines is specified by
+the variable @code{list-matching-lines-default-context-lines}.
+
+You can also run @kbd{M-s o} when an incremental search is active;
+this uses the current search string.
 
 @kindex RET @r{(Occur mode)}
 @kindex o @r{(Occur mode)}
@@ -1744,12 +1750,6 @@ mode.
 The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x
 occur}.
 
-@kindex M-s o
-@item M-s o
-Run @code{occur} using the search string of the last incremental
-string search.  You can also run @kbd{M-s o} when an incremental
-search is active; this uses the current search string.
-
 @item M-x multi-occur
 This command is just like @code{occur}, except it is able to search
 through multiple buffers.  It asks you to specify the buffer names one
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 4c6a1ffbdd2..6c513c9a607 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1088,92 +1088,101 @@ header line.
 
 @table @kbd
 @item C-c C-c
-Make the current heading line's body invisible (@code{hide-entry}).
+Make the current heading line's body invisible
+(@code{outline-hide-entry}).
 @item C-c C-e
-Make the current heading line's body visible (@code{show-entry}).
+Make the current heading line's body visible
+(@code{outline-show-entry}).
 @item C-c C-d
 Make everything under the current heading invisible, not including the
-heading itself (@code{hide-subtree}).
+heading itself (@code{outline-hide-subtree}).
 @item C-c C-s
 Make everything under the current heading visible, including body,
-subheadings, and their bodies (@code{show-subtree}).
+subheadings, and their bodies (@code{outline-show-subtree}).
 @item C-c C-l
 Make the body of the current heading line, and of all its subheadings,
-invisible (@code{hide-leaves}).
+invisible (@code{outline-hide-leaves}).
 @item C-c C-k
 Make all subheadings of the current heading line, at all levels,
-visible (@code{show-branches}).
+visible (@code{outline-show-branches}).
 @item C-c C-i
 Make immediate subheadings (one level down) of the current heading
-line visible (@code{show-children}).
+line visible (@code{outline-show-children}).
 @item C-c C-t
-Make all body lines in the buffer invisible (@code{hide-body}).
+Make all body lines in the buffer invisible
+(@code{outline-hide-body}).
 @item C-c C-a
-Make all lines in the buffer visible (@code{show-all}).
+Make all lines in the buffer visible (@code{outline-show-all}).
 @item C-c C-q
 Hide everything except the top @var{n} levels of heading lines
-(@code{hide-sublevels}).
+(@code{outline-hide-sublevels}).
 @item C-c C-o
 Hide everything except for the heading or body that point is in, plus
 the headings leading up from there to the top level of the outline
-(@code{hide-other}).
+(@code{outline-hide-other}).
 @end table
 
-@findex hide-entry
-@findex show-entry
+@findex outline-hide-entry
+@findex outline-show-entry
 @kindex C-c C-c @r{(Outline mode)}
 @kindex C-c C-e @r{(Outline mode)}
   The simplest of these commands are @kbd{C-c C-c}
-(@code{hide-entry}), which hides the body lines directly following the
-current heading line, and @kbd{C-c C-e} (@code{show-entry}), which
-reveals them.  Subheadings and their bodies are not affected.
+(@code{outline-hide-entry}), which hides the body lines directly
+following the current heading line, and @kbd{C-c C-e}
+(@code{outline-show-entry}), which reveals them.  Subheadings and
+their bodies are not affected.
 
-@findex hide-subtree
-@findex show-subtree
+@findex outline-hide-subtree
+@findex outline-show-subtree
 @kindex C-c C-s @r{(Outline mode)}
 @kindex C-c C-d @r{(Outline mode)}
 @cindex subtree (Outline mode)
-  The commands @kbd{C-c C-d} (@code{hide-subtree}) and @kbd{C-c C-s}
-(@code{show-subtree}) are more powerful.  They apply to the current
-heading line's @dfn{subtree}: its body, all of its subheadings, both
-direct and indirect, and all of their bodies.
-
-@findex hide-leaves
-@findex show-branches
-@findex show-children
+  The commands @kbd{C-c C-d} (@code{outline-hide-subtree}) and
+@kbd{C-c C-s} (@code{outline-show-subtree}) are more powerful.  They
+apply to the current heading line's @dfn{subtree}: its body, all of
+its subheadings, both direct and indirect, and all of their bodies.
+
+@findex outline-hide-leaves
+@findex outline-show-branches
+@findex outline-show-children
 @kindex C-c C-l @r{(Outline mode)}
 @kindex C-c C-k @r{(Outline mode)}
 @kindex C-c C-i @r{(Outline mode)}
-  The command @kbd{C-c C-l} (@code{hide-leaves}) hides the body of the
-current heading line as well as all the bodies in its subtree; the
-subheadings themselves are left visible.  The command @kbd{C-c C-k}
-(@code{show-branches}) reveals the subheadings, if they had previously
-been hidden (e.g., by @kbd{C-c C-d}).  The command @kbd{C-c C-i}
-(@code{show-children}) is a weaker version of this; it reveals just
-the direct subheadings, i.e., those one level down.
-
-@findex hide-other
+  The command @kbd{C-c C-l} (@code{outline-hide-leaves}) hides the
+body of the current heading line as well as all the bodies in its
+subtree; the subheadings themselves are left visible.  The command
+@kbd{C-c C-k} (@code{outline-show-branches}) reveals the subheadings,
+if they had previously been hidden (e.g., by @kbd{C-c C-d}).  The
+command @kbd{C-c C-i} (@code{outline-show-children}) is a weaker
+version of this; it reveals just the direct subheadings, i.e., those
+one level down.
+
+@findex outline-hide-other
 @kindex C-c C-o @r{(Outline mode)}
-  The command @kbd{C-c C-o} (@code{hide-other}) hides everything
-except the entry that point is in, plus its parents (the headers
-leading up from there to top level in the outline) and the top level
-headings.
-
-@findex hide-body
-@findex show-all
+  The command @kbd{C-c C-o} (@code{outline-hide-other}) hides
+everything except the entry that point is in, plus its parents (the
+headers leading up from there to top level in the outline) and the top
+level headings.  It also reveals body lines preceding the first
+heading in the buffer.
+
+@findex outline-hide-body
+@findex outline-show-all
 @kindex C-c C-t @r{(Outline mode)}
 @kindex C-c C-a @r{(Outline mode)}
 @findex hide-sublevels
 @kindex C-c C-q @r{(Outline mode)}
   The remaining commands affect the whole buffer.  @kbd{C-c C-t}
-(@code{hide-body}) makes all body lines invisible, so that you see
-just the outline structure (as a special exception, it will not hide
-lines at the top of the file, preceding the first header line, even
-though these are technically body lines).  @kbd{C-c C-a}
-(@code{show-all}) makes all lines visible.  @kbd{C-c C-q}
-(@code{hide-sublevels}) hides all but the top level headings; with a
-numeric argument @var{n}, it hides everything except the top @var{n}
-levels of heading lines.
+(@code{outline-hide-body}) makes all body lines invisible, so that you
+see just the outline structure (as a special exception, it will not
+hide lines at the top of the file, preceding the first header line,
+even though these are technically body lines).  @kbd{C-c C-a}
+(@code{outline-show-all}) makes all lines visible.  @kbd{C-c C-q}
+(@code{outline-hide-sublevels}) hides all but the top level headings
+at and above the level of the current heading line (defaulting to 1 if
+point is not on a heading); with a numeric argument @var{n}, it hides
+everything except the top @var{n} levels of heading lines.  Note that
+it completely reveals all the @var{n} top levels and the body lines
+before the first heading.
 
 @anchor{Outline Search}
 @findex reveal-mode
@@ -1219,8 +1228,9 @@ levels.
 
   Consider an Outline mode buffer with all the text and subheadings under
 level-1 headings hidden.  To look at what is hidden under one of these
-headings, you could use @kbd{C-c C-e} (@kbd{M-x show-entry}) to expose
-the body, or @kbd{C-c C-i} to expose the child (level-2) headings.
+headings, you could use @kbd{C-c C-e} (@kbd{M-x outline-show-entry})
+to expose the body, or @kbd{C-c C-i} to expose the child (level-2)
+headings.
 
 @kindex C-c C-z
 @findex foldout-zoom-subtree
@@ -1235,11 +1245,12 @@ in the mode line shows how deep you've gone.
 
   When zooming in on a heading, to see only the child subheadings specify
 a numeric argument: @kbd{C-u C-c C-z}.  The number of levels of children
-can be specified too (compare @kbd{M-x show-children}), e.g., @kbd{M-2
-C-c C-z} exposes two levels of child subheadings.  Alternatively, the
-body can be specified with a negative argument: @kbd{M-- C-c C-z}.  The
-whole subtree can be expanded, similarly to @kbd{C-c C-s} (@kbd{M-x
-show-subtree}), by specifying a zero argument: @kbd{M-0 C-c C-z}.
+can be specified too (compare @kbd{M-x outline-show-children}), e.g.,
+@w{@kbd{M-2 C-c C-z}} exposes two levels of child subheadings.
+Alternatively, the body can be specified with a negative argument:
+@w{@kbd{M-- C-c C-z}}.  The whole subtree can be expanded, similarly to
+@kbd{C-c C-s} (@kbd{M-x outline-show-subtree}), by specifying a zero
+argument: @w{@kbd{M-0 C-c C-z}}.
 
   While you're zoomed in, you can still use Outline mode's exposure and
 hiding functions without disturbing Foldout.  Also, since the buffer is
@@ -1256,8 +1267,8 @@ argument exits that many levels of folds.  Specifying a zero argument
 exits all folds.
 
   To cancel the narrowing of a fold without hiding the text and
-subheadings, specify a negative argument.  For example, @kbd{M--2 C-c
-C-x} exits two folds and leaves the text and subheadings exposed.
+subheadings, specify a negative argument.  For example, @w{@kbd{M--2 C-c
+C-x}} exits two folds and leaves the text and subheadings exposed.
 
   Foldout mode also provides mouse commands for entering and exiting
 folds, and for showing and hiding text:
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 0c0827909a3..947c54f9c35 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -368,7 +368,7 @@ UPattern.  For example:
 @item (app @var{function} @var{upattern})
 Matches if @var{function} applied to the value being matched returns a
 value that matches @var{upattern}.  This is like the @code{pred}
-UPattern, except that it tests the result against @var{UPattern},
+UPattern, except that it tests the result against @var{upattern},
 rather than against a boolean truth value.  The @var{function} call can
 use one of the forms described below.
 @item (or @var{upattern1} @var{upattern2}@dots{})
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index d050738d80f..851baa31f30 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2548,7 +2548,7 @@ modifying the attributes of a named face.
 This function returns the value of the @var{attribute} attribute for
 @var{face} on @var{frame}.
 
-If @var{frame} is @code{nil}, that means the selected frame
+If @var{frame} is omitted or @code{nil}, that means the selected frame
 (@pxref{Input Focus}).  If @var{frame} is @code{t}, this function
 returns the value of the specified attribute for newly-created frames
 (this is normally @code{unspecified}, unless you have specified some
@@ -2644,8 +2644,8 @@ created frames.
 
   The following commands and functions mostly provide compatibility
 with old versions of Emacs.  They work by calling
-@code{set-face-attribute}.  Values of @code{t} and @code{nil} for
-their @var{frame} argument are handled just like
+@code{set-face-attribute}.  Values of @code{t} and @code{nil} (or
+omitted) for their @var{frame} argument are handled just like
 @code{set-face-attribute} and @code{face-attribute}.  The commands
 read their arguments using the minibuffer, if called interactively.
 
@@ -2714,7 +2714,8 @@ name used for @var{character}.
 @defun face-foreground face &optional frame inherit
 @defunx face-background face &optional frame inherit
 These functions return the foreground color (or background color,
-respectively) of face @var{face}, as a string.
+respectively) of face @var{face}, as a string.  If the color is
+unspecified, they return @code{nil}.
 @end defun
 
 @defun face-stipple face &optional frame inherit
@@ -4178,12 +4179,12 @@ bar.)  @var{horizontal-type} is either @code{bottom} or @code{nil}
 (which means no horizontal scroll bar).
 @end defun
 
-@defun frame-scroll-bar-width &optional Lisp_Object &optional frame
+@defun frame-scroll-bar-width &optional frame
 This function returns the width of vertical scroll bars of @var{frame}
 in pixels.
 @end defun
 
-@defun frame-scroll-bar-height &optional Lisp_Object &optional frame
+@defun frame-scroll-bar-height &optional frame
 This function returns the height of horizontal scroll bars of
 @var{frame} in pixels.
 @end defun
@@ -7155,7 +7156,7 @@ Emacs is displaying the frame using X.
 Emacs is displaying the frame using native MS-Windows GUI.
 @item ns
 Emacs is displaying the frame using the Nextstep interface (used on
-GNUstep and Mac OS X).
+GNUstep and macOS).
 @item pc
 Emacs is displaying the frame using MS-DOS direct screen writes.
 @item nil
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 90f8e3501b2..dc1c524653d 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -764,7 +764,7 @@ its size using the @code{height} and @code{width} parameters
 with sizes and positions.  For all of these functions the argument
 @var{frame} must denote a live frame and defaults to the selected frame.
 
-@defun frame-position &optional Lisp_Object &optional frame
+@defun frame-position &optional frame
 This function returns the outer position (@pxref{Frame Layout}) of
 @var{frame} in pixels.  The value is a cons giving the coordinates of
 the top left corner of the outer frame of @var{frame} relative to an
@@ -772,9 +772,9 @@ origin at the position (0, 0) of the frame's display.  On a text
 terminal frame both values are zero.
 @end defun
 
-@defun set-frame-position frame X Y
-This function sets the outer frame position of @var{frame} to @var{X}
-and @var{Y}.  The latter arguments specify pixels and normally count
+@defun set-frame-position frame x y
+This function sets the outer frame position of @var{frame} to @var{x}
+and @var{y}.  The latter arguments specify pixels and normally count
 from an origin at the position (0, 0) of @var{frame}'s display.
 
 A negative parameter value positions the right edge of the outer frame
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index a73ae596e0d..44ce719bc1f 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -610,8 +610,8 @@ and @code{define-global-minor-mode}.
 
 @item Other definition types:
 @code{defcustom}, @code{defgroup}, @code{defclass}
-(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton} (see the
-commentary in @file{skeleton.el}).
+(@pxref{Top,EIEIO,,eieio,EIEIO}), and @code{define-skeleton}
+(@pxref{Top,Autotyping,,autotype,Autotyping}).
 @end table
 
   You can also use a magic comment to execute a form at build time
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index fd2ce3248fd..9f805c2c1d9 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1049,8 +1049,7 @@ Unix convention, used on GNU and Unix systems, is to use the linefeed
 character (also called newline).  The DOS convention, used on
 MS-Windows and MS-DOS systems, is to use a carriage-return and a
 linefeed at the end of a line.  The Mac convention is to use just
-carriage-return.  (This was the convention used on the Macintosh
-system prior to OS X.)
+carriage-return.  (This was the convention used in Classic Mac OS.)
 
 @cindex base coding system
 @cindex variant coding system
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 3312705e167..903bad3b9c5 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -891,7 +891,7 @@ Berkeley BSD and its variants.
 Cygwin, a Posix layer on top of MS-Windows.
 
 @item darwin
-Darwin (Mac OS X).
+Darwin (macOS).
 
 @item gnu
 The GNU system (using the GNU kernel, which consists of the HURD and Mach).
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 87c0b5c7687..21e1429f59d 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -648,7 +648,7 @@ I/O, file-name-coding-system}).
 If @var{coding} is @code{nil}, the default rules for finding the
 coding system will apply.  @xref{Default Coding Systems}.
 
-@item :connection-type @var{TYPE}
+@item :connection-type @var{type}
 Initialize the type of device used to communicate with the subprocess.
 Possible values are @code{pty} to use a pty, @code{pipe} to use a
 pipe, or @code{nil} to use the default derived from the value of the
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index c6a3eb035ad..0da34d14f24 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4666,7 +4666,7 @@ Return all nodes in @var{dom} that have IDs that match @var{match},
 which is a regular expression.
 
 @item dom-strings @var{dom}
-Return all strings in @var{DOM}.
+Return all strings in @var{dom}.
 
 @end table
 
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index a8589df031c..b45e68d0d56 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -165,10 +165,10 @@ follow the naming conventions for hooks.  @xref{Hooks}.
 @item
 @cindex unloading packages, preparing for
 If loading the file adds functions to hooks, define a function
-@code{@var{feature}-unload-hook}, where @var{feature} is the name of
-the feature the package provides, and make it undo any such changes.
-Using @code{unload-feature} to unload the file will run this function.
-@xref{Unloading}.
+@code{@var{feature}-unload-function}, where @var{feature} is the name
+of the feature the package provides, and make it undo any such
+changes.  Using @code{unload-feature} to unload the file will run this
+function.  @xref{Unloading}.
 
 @item
 It is a bad idea to define aliases for the Emacs primitives.  Normally
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index d66a9448e63..2823cc55214 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -557,7 +557,7 @@ time @code{window-size-change-functions} was run for the last time on
 @cindex pixel width of a window
 @cindex total pixel width of a window
 
-@defun window-pixel-width &optional Lisp_Object &optional window
+@defun window-pixel-width &optional window
 This function returns the width of window @var{window} in pixels.
 @var{window} must be a valid window and defaults to the selected one.
 
@@ -4469,14 +4469,14 @@ This function returns the pixel edges of @var{window}'s body.  Calling
 the origin of the display screen rather than that of the frame:
 
 @defun window-absolute-pixel-edges &optional window
-This function returns the pixel coordinates of @var{WINDOW} relative to
+This function returns the pixel coordinates of @var{window} relative to
 an origin at (0, 0) of the display of @var{window}'s frame.  Calling
 @code{(window-absolute-pixel-edges)} is equivalent to calling
 @code{(window-edges window nil t t)}, see above.
 @end defun
 
 @defun window-absolute-body-pixel-edges &optional window
-This function returns the pixel coordinates of @var{WINDOW}'s body
+This function returns the pixel coordinates of @var{window}'s body
 relative to an origin at (0, 0) of the display of @var{window}'s frame.
 Calling @code{(window-absolute-body-pixel-edges window)} is equivalent
 to calling @code{(window-edges window t t t)}, see above.
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 72a90a1ff21..9efe0e73c5c 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1206,7 +1206,7 @@ Emacs can be started as a daemon in the background.
 
 @cindex NeXTstep port
 @cindex GNUstep port
-@cindex Mac OS X Cocoa
+@cindex macOS Cocoa
 @item
 There is a new NeXTstep port of Emacs.  This supports GNUstep and Mac OS
 X (via the Cocoa libraries).  The Carbon port of Emacs, which supported
@@ -3341,7 +3341,7 @@ problem (@pxref{Reporting bugs}).
 * Emacs for MS-DOS::
 * Emacs for MS-Windows::
 * Emacs for GNUstep::
-* Emacs for Mac OS X::
+* Emacs for macOS::
 @end menu
 
 @node Finding Emacs on the Internet
@@ -3561,13 +3561,13 @@ For MS-DOS, @pxref{Emacs for MS-DOS}.
 Beginning with version 23.1, Emacs supports GNUstep natively.
 See the file @file{nextstep/INSTALL} in the distribution.
 
-@node Emacs for Mac OS X
-@section Where can I get Emacs for Mac OS X?
+@node Emacs for macOS
+@section Where can I get Emacs for macOS?
 @cindex Apple computers, Emacs for
 @cindex Macintosh, Emacs for
-@cindex Mac OS X, Emacs for
+@cindex macOS, Emacs for
 
-Beginning with version 22.1, Emacs supports Mac OS X natively.
+Beginning with version 22.1, Emacs supports macOS natively.
 See the file @file{nextstep/INSTALL} in the distribution.
 
 @c ------------------------------------------------------------
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 2473d26cc15..c34dd7caf08 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21522,7 +21522,7 @@ bound to mairix searches and are automatically updated.
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
 GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), Mac OS X and Solaris.  The homepage can
+runs under Windows (with cygwin), macOS and Solaris.  The homepage can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
 
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 26c81d65948..32b33641656 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -75,7 +75,7 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
 * Sources of Routine Info::     How does IDLWAVE know about routine XYZ
 * HTML Help Browser Tips::
 * Configuration Examples::      The user is king
-* Windows and MacOS::           What still works, and how
+* Windows and macOS::           What still works, and how
 * Troubleshooting::             When good computers turn bad
 * GNU Free Documentation License:: The license for this documentation.
 * Index::                       Fast access
@@ -2372,7 +2372,7 @@ Normal hook.  Executed when @file{idlwave.el} is loaded.
 @cindex Subprocess of Emacs, IDL
 @cindex Comint, Emacs package
 @cindex Windows
-@cindex MacOS
+@cindex macOS
 
 The IDLWAVE shell is an Emacs major mode which permits running the IDL
 program as an inferior process of Emacs, and works closely with the
@@ -2382,7 +2382,7 @@ debug these programs.  The IDLWAVE shell is built on @file{comint}, an
 Emacs packages which handles the communication with the IDL program.
 Unfortunately, IDL for Windows does not have command-prompt versions and
 thus do not allow the interaction with Emacs, so the IDLWAVE shell
-currently only works under Unix and MacOSX.
+currently works under only Unix and macOS.
 
 @menu
 * Starting the Shell::          How to launch IDL as a subprocess
@@ -3533,14 +3533,14 @@ to locate library catalogs.
 @end defopt
 
 @defopt idlwave-library-path
-IDL library path for Windows and MacOS@.  Under Unix/MacOSX, will be
+IDL library path for Windows and macOS@.  Under Unix/macOS, will be
 obtained from the Shell when run.
 @end defopt
 
 @defopt idlwave-system-directory
-The IDL system directory for Windows and MacOS@.  Also needed for
+The IDL system directory for Windows and macOS@.  Also needed for
 locating HTML help and the IDL Assistant for IDL v6.2 and later.  Under
-Unix/MacOSX, will be obtained from the Shell and recorded, if run.
+Unix/macOS, will be obtained from the Shell and recorded, if run.
 @end defopt
 
 @defopt idlwave-config-directory (@file{~/.emacs.d/idlwave})
@@ -3626,7 +3626,7 @@ performance is a problem and/or the catalogs are not needed.
 @cindex User catalog
 @cindex IDL library routine info
 @cindex Windows
-@cindex MacOS
+@cindex macOS
 @cindex IDL variable @code{!DIR}
 @cindex @code{!DIR}, IDL variable
 
@@ -3651,7 +3651,7 @@ catalog must be rescanned to update it.  Creating the user catalog is
 also much slower than scanning library catalogs.
 
 You can scan any of the directories on the currently known path.  Under
-Windows and MacOS (not OSX), you need to specify the IDL search path in
+Windows, you need to specify the IDL search path in
 the variable @code{idlwave-library-path}, and the location of the IDL
 directory (the value of the @code{!DIR} system variable) in the variable
 @code{idlwave-system-directory}, like this@footnote{The initial @samp{+}
@@ -3742,10 +3742,9 @@ files.  Therefore, such local files should not be installed inside the
 many other reasons.
 
 @cindex Windows
-@cindex MacOS
 @cindex IDL variable @code{!DIR}
 @cindex @code{!DIR}, IDL variable
-Users of Windows and MacOS (not X) also must set the variable
+Users of Windows also must set the variable
 @code{idlwave-system-directory} to the value of the @code{!DIR} system
 variable in IDL@.  IDLWAVE appends @file{lib} to the value of this
 variable and assumes that all files found on that path are system
@@ -3822,7 +3821,7 @@ etc.).
 @noindent Individual platform recommendations:
 
 @itemize @bullet
-@item Unix/MacOSX: The @uref{http://www.w3m.org,@code{w3m}} browser
+@item Unix/macOS: The @uref{http://www.w3m.org,@code{w3m}} browser
 and its associated
 @uref{http://emacs-w3m.namazu.org/,@code{emacs-w3m}} emacs mode
 provide in-buffer browsing with image display, and excellent speed and
@@ -4020,18 +4019,17 @@ user is King!
 @html
 <A NAME="WINDOWS_MAC"></A>
 @end html
-@node Windows and MacOS
-@appendix Windows and MacOS
+@node Windows and macOS
+@appendix Windows and macOS
 @cindex Windows
-@cindex MacOS
-@cindex MacOSX
+@cindex macOS
 
 IDLWAVE was developed on a UNIX system.  However, thanks to the
 portability of Emacs, much of IDLWAVE does also work under different
-operating systems like Windows (with NTEmacs or NTXEmacs) or MacOS.
+operating systems like Windows (with NTEmacs or NTXEmacs).
 
 The only real problem is that there is no command-line version of IDL
-for Windows or MacOS(<=9) with which IDLWAVE can interact.  As a
+for Windows with which IDLWAVE can interact.  As a
 result, the IDLWAVE Shell does not work and you have to rely on IDLDE
 to run and debug your programs.  However, editing IDL source files
 with Emacs/IDLWAVE works with all bells and whistles, including
@@ -4112,10 +4110,10 @@ ensure @samp{idl} is on your @samp{$PATH}, or specify the full
 pathname to the idl program with the variable
 @code{idlwave-shell-explicit-file-name}.  Note that you may need to
 set your shell search path in two places when running Emacs as an Aqua
-application with MacOSX; see the next topic.
+application with macOS; see the next topic.
 
 @item @strong{IDLWAVE is disregarding my @samp{IDL_PATH} which I set
-under MacOSX}
+under macOS}
 
 If you run Emacs directly as an Aqua application, rather than from the
 console shell, the environment is set not from your usual shell
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 8deead52dc6..69d3fc42277 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -68,7 +68,7 @@ database.
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
 GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), Mac OS X and Solaris.  The homepage can
+runs under Windows (with cygwin), macOS and Solaris.  The homepage can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index a5239acb59f..a6f9dbde7cb 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -6616,7 +6616,7 @@ applying it to another one.
 @vindex org-clock-idle-time
 By customizing the variable @code{org-clock-idle-time} to some integer, such
 as 10 or 15, Emacs can alert you when you get back to your computer after
-being idle for that many minutes@footnote{On computers using Mac OS X,
+being idle for that many minutes@footnote{On computers using macOS,
 idleness is based on actual user idleness, not just Emacs' idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
 @code{contrib/scripts} directory of the Org git distribution, or install the
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 0e09cf7e7bb..955a13e477a 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -933,7 +933,7 @@ D-Bus, dbus}.
 @cindex afp method
 
 This method is for connecting to remote hosts with the Apple Filing
-Protocol for accessing files on Mac OS X volumes.  @value{tramp} access
+Protocol for accessing files on macOS volumes.  @value{tramp} access
 syntax requires a leading volume (share) name, for example:
 @file{@trampfn{afp,user@@host,/volume}}.