More fixes in the Emacs manual

* doc/emacs/screen.texi (Mode Line): Fix markup and
cross-references.
(Menu Bar): Correct inaccurate description.
* doc/emacs/macos.texi (Mac OS / GNUstep, Mac / GNUstep Events):
* doc/emacs/frames.texi (Scroll Bars):
* doc/emacs/emacs.texi (Top):
* doc/emacs/ack.texi (Acknowledgments): Fix spelling of "macOS".
* doc/emacs/misc.texi (Invoking emacsclient)
(emacsclient Options): Fix markup of 'emacsclient'.  Suggested by
Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.

6 files changed, 25 insertions, 25 deletions

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index ee8649a0451..20c8d4e610b 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -209,8 +209,8 @@ for Korean Hanja.
 
 @item
 Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used
-prior to Emacs 23 for Mac OS@.  Yamamoto Mitsuharu continued to
-contribute to Mac OS support in the newer Nextstep port; and also
+prior to Emacs 23 for macOS@.  Yamamoto Mitsuharu continued to
+contribute to macOS support in the newer Nextstep port; and also
 improved support for multi-monitor displays.
 
 @item
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 5904740b1f6..0051868fee6 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -221,7 +221,7 @@ Appendices
 * Emacs Invocation::    Hairy startup options.
 * X Resources::         X resources for customizing Emacs.
 * Antinews::            Information about Emacs version 25.
-* Mac OS / GNUstep::    Using Emacs under Mac OS and GNUstep.
+* Mac OS / GNUstep::     Using Emacs under macOS and GNUstep.
 * Microsoft Windows::   Using Emacs on Microsoft Windows and MS-DOS.
 * Manifesto::           What's GNU?  Gnu's Not Unix!
 
@@ -1226,10 +1226,10 @@ GTK resources
 * GTK Names in Emacs::    GTK widgets used by Emacs.
 * GTK styles::            What can be customized in a GTK widget.
 
-Emacs and Mac OS / GNUstep
+Emacs and macOS / GNUstep
 
-* Mac / GNUstep Basics::        Basic Emacs usage under GNUstep or Mac OS.
-* Mac / GNUstep Customization:: Customizations under GNUstep or Mac OS.
+* Mac / GNUstep Basics::        Basic Emacs usage under GNUstep or macOS.
+* Mac / GNUstep Customization:: Customizations under GNUstep or macOS.
 * Mac / GNUstep Events::        How window system events are handled.
 * GNUstep Support::             Details on status of GNUstep support.
 
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 7a7e1fd5636..7c1d36c720b 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -975,7 +975,7 @@ variable @code{scroll-bar-mode}.  Its value should be either
 @code{right} (put scroll bars on the right side of windows), @code{left}
 (put them on the left), or @code{nil} (disable vertical scroll bars).
 By default, Emacs puts scroll bars on the right if it was compiled with
-GTK+ support on the X Window System, and on MS-Windows or Mac OS; Emacs
+GTK+ support on the X Window System, and on MS-Windows or macOS; Emacs
 puts scroll bars on the left if compiled on the X Window System without
 GTK+ support (following the old convention for X applications).
 
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 9af6f93b0c8..cf4e48bacb8 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 2000-2018 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mac OS / GNUstep
-@appendix Emacs and Mac OS / GNUstep
+@appendix Emacs and macOS / GNUstep
 @cindex macOS
 @cindex Macintosh
 @cindex GNUstep
@@ -12,7 +12,7 @@ the GNUstep libraries on GNU/Linux or other operating systems, or on
 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 before Mac OS X 10.6.
+does not support versions before macOS 10.6.
 
   For various historical and technical reasons, Emacs uses the term
 @samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for
@@ -25,14 +25,14 @@ this writing, Emacs GNUstep support is alpha status (@pxref{GNUstep
 Support}), but we hope to improve it in the future.
 
 @menu
-* Mac / GNUstep Basics::        Basic Emacs usage under GNUstep or Mac OS.
-* Mac / GNUstep Customization:: Customizations under GNUstep or Mac OS.
+* Mac / GNUstep Basics::        Basic Emacs usage under GNUstep or macOS.
+* Mac / GNUstep Customization:: Customizations under GNUstep or macOS.
 * Mac / GNUstep Events::        How window system events are handled.
 * GNUstep Support::             Details on status of GNUstep support.
 @end menu
 
 @node Mac / GNUstep Basics
-@section Basic Emacs usage under Mac OS and GNUstep
+@section Basic Emacs usage under macOS and GNUstep
 
   By default, the @key{alt} and @key{option} keys are the same as
 @key{Meta}.  The Mac @key{Cmd} key is the same as @key{Super}, and
@@ -128,7 +128,7 @@ at the command-line before starting Emacs:
 
 
 @node Mac / GNUstep Events
-@section Windowing System Events under Mac OS / GNUstep
+@section Windowing System Events under macOS / GNUstep
 
   Nextstep applications receive a number of special events which have
 no X equivalent.  These are sent as specially defined key events, which
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index aeb8560ea00..3300ed67c6e 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1729,7 +1729,7 @@ different virtual terminals, and switch to the Emacs server's virtual
 terminal after calling @command{emacsclient}; or (ii) call
 @command{emacsclient} from within the Emacs server itself, using Shell
 mode (@pxref{Interactive Shell}) or Term mode (@pxref{Term Mode});
-@code{emacsclient} blocks only the subshell under Emacs, and you can
+@command{emacsclient} blocks only the subshell under Emacs, and you can
 still use Emacs to edit the file.
 
 @kindex C-x #
@@ -1794,13 +1794,13 @@ listed below:
 @table @samp
 @item -a @var{command}
 @itemx --alternate-editor=@var{command}
-Specify a shell command to run if @code{emacsclient} fails to contact Emacs.
-This is useful when running @code{emacsclient} in a script.
-The command may include arguments, which may be quoted "like this".
-Currently, escaping of quotes is not supported.
+Specify a shell command to run if @command{emacsclient} fails to
+contact Emacs.  This is useful when running @code{emacsclient} in a
+script.  The command may include arguments, which may be quoted "like
+this".  Currently, escaping of quotes is not supported.
 
 As a special exception, if @var{command} is the empty string, then
-@code{emacsclient} starts Emacs in daemon mode (as @command{emacs
+@command{emacsclient} starts Emacs in daemon mode (as @samp{emacs
 --daemon}) and then tries connecting again.
 
 @cindex @env{ALTERNATE_EDITOR} environment variable
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index fb4eff9711a..c8b22aa68cb 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -228,8 +228,8 @@ modified, it shows two stars (@samp{**}).  For a read-only buffer, it
 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 (@pxref{File Names}), @samp{@@} is displayed instead.
+However, if @code{default-directory} (@pxref{File Names}) for the
+current buffer is on a remote machine, @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}.
@@ -296,10 +296,10 @@ at the end of a menu item means that the command will prompt you for
 further input before it actually does anything.
 
   Some of the commands in the menu bar have ordinary key bindings as
-well; if so, a key binding is shown in parentheses after the item
-itself.  To view the full command name and documentation for a menu
-item, type @kbd{C-h k}, and then select the menu bar with the mouse in
-the usual way (@pxref{Key Help}).
+well; if so, a key binding is shown after the item itself.  To view
+the full command name and documentation for a menu item, type
+@kbd{C-h k}, and then select the menu bar with the mouse in the usual
+way (@pxref{Key Help}).
 
 @kindex F10
 @findex menu-bar-open