Minor clarifications. Explain that one normally specifies face attributes

rather than a font name.

diff --git a/man/macos.texi b/man/macos.texi
index 42cdb99b60c8fb784eaba82ae66c087f3f07f134..66bcbd77ccb1f5b6378063cf8740a8a72c12e56c 100644 (file)
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -42,8 +42,8 @@ they are not supported in the Mac OS version.
   On the Mac, Emacs can use either the @key{option} key or the
 @key{command} key as the @key{META} key.  If the value of the variable
 @code{mac-command-key-is-meta} is non-@code{nil} (its default value),
-Emacs uses the @key{command} key as the @key{META} key.  Otherwise it uses the
-@key{option} key as the @key{META} key.
+Emacs uses the @key{command} key as the @key{META} key.  Otherwise it
+uses the @key{option} key as the @key{META} key.
 
   Most people should want to use the @key{command} key as the @key{META} key,
 so that dead-key processing with the @key{option} key will still work.  This is
@@ -69,8 +69,9 @@ characters.
   To enter ISO Latin-2 characters directly from the Mac keyboard, set
 the value of @code{mac-keyboard-text-encoding} to
 @code{kTextEncodingISOLatin2}.  Then let Emacs know that the keyboard
-generates Latin-2 codes by typing @kbd{C-x RET k iso-latin-2 RET}.  To
-make this setting permanent, put this in your @file{.emacs} init file:
+generates Latin-2 codes, by typing @kbd{C-x @key{RET} k iso-latin-2
+@key{RET}}.  To make this setting permanent, put this in your
+@file{.emacs} init file:
 
 @lisp
 (set-keyboard-coding-system 'iso-latin-2)
@@ -82,10 +83,11 @@ make this setting permanent, put this in your @file{.emacs} init file:
 @cindex clipboard support (Mac OS)
 
   The Mac uses a non-standard encoding for the upper 128 single-byte
-characters.  It also deviates from the ISO 2022 standard by using code
-points in the range 128-159.  The coding system @code{mac-roman} is used
-to represent this Mac encoding.  It is used for editing files stored in
-this native encoding, and for displaying file names in Dired mode.
+characters.  It also deviates from the ISO 2022 standard by using
+character codes in the range 128-159.  The coding system
+@code{mac-roman} is used to represent this Mac encoding.  It is used
+for editing files stored in this native encoding, and for displaying
+file names in Dired mode.
 
   Any native (non-symbol) Mac font can be used to correctly display
 characters in the @code{mac-roman} coding system.
@@ -95,8 +97,8 @@ is run on the Mac.  It displays characters in the @code{mac-roman}
 coding system using 12-point Monaco.
 
   To insert characters directly in the @code{mac-roman} coding system,
-type @kbd{C-x RET k mac-roman RET}, or put this in your @file{.emacs}
-init file:
+type @kbd{C-x @key{RET} k mac-roman @key{RET}}, or put this in your
+@file{.emacs} init file:
 
 @lisp
 (set-keyboard-coding-system 'mac-roman)
@@ -112,7 +114,7 @@ Methods}) or the Mac OS to enter international characters.
 of the manual.
 
   To use input methods provided by the Mac OS, set the keyboard coding
-system accordingly using the @kbd{C-x RET k} command
+system accordingly using the @kbd{C-x @key{RET} k} command
 (@code{set-keyboard-coding-system}).  For example, for Traditional
 Chinese, use @samp{chinese-big5} as keyboard coding system; for
 Japanese, use @samp{sjis}, etc.  Then select the desired input method in
@@ -126,9 +128,9 @@ a piece of text and paste it into another Mac application, or cut or copy
 one in another Mac application and yank it into a Emacs buffer.
 
   The encoding of text selections must be specified using the commands
-@kbd{C-x RET x} (@code{set-selection-coding-system}) or @kbd{C-x RET X}
-(@code{set-next-selection-coding-system}) (e.g., for Traditional
-Chinese, use @samp{chinese-big5-mac} and for Japanese,
+@kbd{C-x @key{RET} x} (@code{set-selection-coding-system}) or @kbd{C-x
+@key{RET} X} (@code{set-next-selection-coding-system}) (e.g., for
+Traditional Chinese, use @samp{chinese-big5-mac} and for Japanese,
 @samp{sjis-mac}).  @xref{Specify Coding}, for more details.
 
 
@@ -188,8 +190,9 @@ another directory but this folder will still be created.
 @section Specifying Fonts on the Mac
 @cindex font names (Mac OS)
 
-  Fonts are specified to Emacs on the Mac in the form of a standard X
-font name, i.e.
+  It is rare that you need to specify a font name in Emacs; usually
+you specify face attributes instead.  But when you do need to specify
+a font name in Emacs on the Mac, use a standard X font name:
 
 @smallexample
 -@var{maker}-@var{family}-@var{weight}-@var{slant}-@var{widthtype}-@var{style}@dots{}
@@ -197,8 +200,7 @@ font name, i.e.
 @end smallexample
 
 @noindent
-@xref{Font X}.  Wildcards
-are supported as they are on X.
+@xref{Font X}.  Wildcards are supported as they are on X.
 
   Native Apple fonts in Mac Roman encoding has maker name @code{apple}
 and charset @code{mac-roman}.  For example 12-point Monaco can be