summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-01-01 16:10:24 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-01-01 16:10:24 +0000
commita3a43b3be42be9db6a39db355ed65572c4671874 (patch)
treefefc6d8dc57778182b84794cef37f44e545febb0 /lispref
parent132c96248b5cc28fdd729042f47e126e572d4aaa (diff)
downloademacs-a3a43b3be42be9db6a39db355ed65572c4671874.tar.gz
(Face Attributes): Correct xref to renamed node.
Diffstat (limited to 'lispref')
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/display.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 1591bffeb7a..baddbd958fa 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-01 Luc Teirlinck <teirllm@auburn.edu>
+
+ * display.texi (Face Attributes): Correct xref to renamed node.
+
2005-01-01 Richard M. Stallman <rms@gnu.org>
* display.texi (Face Attributes): Describe hex color specs.
diff --git a/lispref/display.texi b/lispref/display.texi
index b4254197e50..344b00e7455 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1890,7 +1890,7 @@ as if they had a light background.
attributes}. This table lists all the face attributes, and what they
mean. Note that in general, more than one face can be specified for a
given piece of text; when that happens, the attributes of all the faces
-are merged to specify how to display the text. @xref{Merging Faces}.
+are merged to specify how to display the text. @xref{Displaying Faces}.
In Emacs 21, any attribute in a face can have the value
@code{unspecified}. This means the face doesn't specify that attribute.