From: Glenn Morris <rgm@gnu.org>
Date: Thu, 15 Nov 2012 06:13:46 +0000 (-0800)
Subject: * display.texi (Face Attributes): Fix :underline COLOR description.
X-Git-Tag: emacs-24.2.90~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c79c7f2f4f3967ec03120cdc53e0e864e1ff7176;p=emacs.git

* display.texi (Face Attributes): Fix :underline COLOR description.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e5320bf9343..d05f48b9f2d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-15  Glenn Morris  <rgm@gnu.org>
+
+	* display.texi (Face Attributes): Fix :underline COLOR description.
+
 2012-11-14  Glenn Morris  <rgm@gnu.org>
 
 	* keymaps.texi (Searching Keymaps, Tool Bar): Untabify examples,
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 68701a47126..6c77a9937d7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2009,12 +2009,11 @@ Don't underline.
 Underline with the foreground color of the face.
 
 @item @var{color}
-Underline in color @var{color}; which should be either a string
-specifying a color, or the symbol @code{foreground-color}, meaning the
-foreground color of the face.
+Underline in color @var{color}, a string specifying a color.
 
 @item @code{(:color @var{color} :style @var{style})}
-@var{color} is as described above.  Omitting the attribute
+@var{color} is either a string, or the symbol @code{foreground-color},
+meaning the foreground color of the face.  Omitting the attribute
 @code{:color} means to use the foreground color of the face.
 @var{style} should be a symbol @code{line} or @code{wave}, meaning to
 use a straight or wavy line.  Omitting the attribute @code{:style}