Merge from emacs-23

[bpt/emacs.git] / doc / emacs / xresources.texi

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index bc60ff9..89ec08d 100644 (file)
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003,
-@c   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node X Resources, Antinews, Emacs Invocation, Top
 @appendix X Options and Resources
@@ -435,13 +435,14 @@ Emacs.pane.menubar.faceName:  Courier-12
 To specify a font, use fontconfig font names as values to the @code{faceName}
 resource.
 
-If Emacs is not built with the Xft library, Lucid menus and dialogs can only 
-display old style fonts.  If Emacs is built with Xft and you prefer the old 
-fonts, you have to specify @samp{none} to @code{faceName}:
+If Emacs is not built with the Xft library, Lucid menus and dialogs
+can only display old style fonts.  If Emacs is built with Xft and you
+prefer the old fonts, you have to specify @samp{none} to
+@code{faceName}:
 
 @example
-Emacs.pane.menubar.faceName:   none
-Emacs.pane.dialog.faceName:    none
+Emacs.pane.menubar.faceName:    none
+Emacs.pane.dialog.faceName:     none
 @end example
 
 @noindent
@@ -472,14 +473,14 @@ Resources for @emph{non-menubar} toolkit pop-up menus have
 the font @samp{8x16} for the pop-up menu items, write this:
 
 @example
-Emacs.menu*.font:      8x16
+Emacs.menu*.font:       8x16
 @end example
 
 @noindent
 For dialog boxes, use @samp{dialog*}:
 
 @example
-Emacs.dialog*.faceName:        Sans-12
+Emacs.dialog*.faceName: Sans-12
 @end example
 
 @noindent