[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107941: * doc/emacs/frames.texi (Fonts): Tweak line and page breaks.

[Glenn Morris]

------------------------------------------------------------
revno: 107941
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-05-02 22:04:07 -0400
message:
  * doc/emacs/frames.texi (Fonts): Tweak line and page breaks.
  Change cross-reference.
  Use example rather than smallexample (these examples are not wide,
  smallexample saves little vertical space, but makes things harder to
  read).
modified:
  doc/emacs/ChangeLog
  doc/emacs/frames.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-05-03 01:41:54 +0000
+++ b/doc/emacs/ChangeLog       2012-05-03 02:04:07 +0000
@@ -1,5 +1,8 @@
 2012-05-03  Glenn Morris  <address@hidden>
 
+       * frames.texi (Fonts): Tweak line and page breaks.
+       Use example rather than smallexample.  Change cross-reference.
+
        * buffers.texi (Buffers, Kill Buffer, Several Buffers)
        (Indirect Buffers): Tweak line- and page-breaks.
 

=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi     2012-04-28 07:45:03 +0000
+++ b/doc/emacs/frames.texi     2012-05-03 02:04:07 +0000
@@ -492,13 +492,13 @@
 @samp{Options} menu.
 
 @item
-Add a line to your init file (@pxref{Init File}), modifying the
-variable @code{default-frame-alist} to specify the @code{font}
-parameter (@pxref{Creating Frames}), like this:
+Add a line to your init file, modifying the variable
address@hidden to specify the @code{font} parameter
+(@pxref{Frame Parameters}), like this:
 
address@hidden
address@hidden
 (add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
address@hidden smallexample
address@hidden example
 
 @cindex X defaults file
 @cindex X resources file
@@ -506,14 +506,14 @@
 Add an @samp{emacs.font} X resource setting to your X resource file,
 like this:
 
address@hidden
address@hidden
 emacs.font: DejaVu Sans Mono-12
address@hidden smallexample
address@hidden example
 
 @noindent
 You must restart X, or use the @command{xrdb} command, for the X
-resources file to take effect.  @xref{Resources}.  When specifying a
-font in your X resources file, you should not quote it.
+resources file to take effect.  @xref{Resources}.  Do not quote
+font names in X resource files.
 
 @item
 If you are running Emacs on the GNOME desktop, you can tell Emacs to
@@ -535,9 +535,9 @@
 first is to use a @dfn{Fontconfig pattern}.  Fontconfig patterns have
 the following form:
 
address@hidden
address@hidden
 @address@hidden:@address@hidden:@address@hidden
address@hidden smallexample
address@hidden example
 
 @noindent
 Within this format, any of the elements in braces may be omitted.
@@ -577,13 +577,13 @@
 @noindent
 Here are some examples of Fontconfig patterns:
 
address@hidden
address@hidden
 Monospace
 Monospace-12
 Monospace-12:bold
 DejaVu Sans Mono:bold:italic
 Monospace-12:weight=bold:slant=italic
address@hidden smallexample
address@hidden example
 
 For a more detailed description of Fontconfig patterns, see the
 Fontconfig manual, which is distributed with Fontconfig and available
@@ -593,9 +593,9 @@
   The second way to specify a font is to use a @dfn{GTK font pattern}.
 These have the syntax
 
address@hidden
address@hidden
 @var{fontname} address@hidden address@hidden
address@hidden smallexample
address@hidden example
 
 @noindent
 where @var{fontname} is the family name, @var{properties} is a list of
@@ -619,10 +619,10 @@
 @noindent
 Here are some examples of GTK font patterns:
 
address@hidden
address@hidden
 Monospace 12
 Monospace Bold Italic 12
address@hidden smallexample
address@hidden example
 
 @cindex XLFD
 @cindex X Logical Font Description
@@ -631,9 +631,9 @@
 specifying fonts under X.  Each XLFD consists of fourteen words or
 numbers, separated by dashes, like this:
 
address@hidden
address@hidden
 -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
address@hidden example
 
 @noindent
 A wildcard character (@samp{*}) in an XLFD matches any sequence of
@@ -644,10 +644,10 @@
 Case is insignificant in an XLFD.  The syntax for an XLFD is as
 follows:
 
address@hidden
address@hidden
 address@hidden@address@hidden@address@hidden@address@hidden
 @address@hidden@address@hidden@address@hidden@address@hidden@var{encoding}
address@hidden smallexample
address@hidden example
 
 @noindent
 The entries have the following meanings:
@@ -706,9 +706,9 @@
 instead of a normal font specification.  For instance, @samp{6x13} is
 equivalent to
 
address@hidden
address@hidden
 -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1
address@hidden smallexample
address@hidden example
 
 @cindex client-side fonts
 @cindex server-side fonts