2 files changed, 10 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e14f7543443..27515b6c87b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-17  Kenichi Handa  <handa@gnu.org>
+
+        * display.texi (Face Attributes): Refer to "Low-Level font" (not
+        "Font Selection") in the explanation of :font attribute.
+
 2013-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * loading.texi (Hooks for Loading): Don't document after-load-alist.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 4adcfdf8f4f..4ad22898046 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2126,7 +2126,8 @@ used automatically to handle certain shades of gray.
 
 @item :font
 The font used to display the face.  Its value should be a font object.
-@xref{Font Selection}, for information about font objects.
+@xref{Low-Level Font}, for information about font objects, font specs,
+and font entities.
 
 When specifying this attribute using @code{set-face-attribute}
 (@pxref{Attribute Functions}), you may also supply a font spec, a font
@@ -3260,7 +3261,9 @@ to @var{value}.
 properties are intermediate between a font object and a font spec:
 like a font object, and unlike a font spec, it refers to a single,
 specific font.  Unlike a font object, creating a font entity does not
-load the contents of that font into computer memory.
+load the contents of that font into computer memory.  Emacs may open
+multiple font objects of different sizes from a single font entity
+referring to a scalable font.
 
 @defun find-font font-spec &optional frame
 This function returns a font entity that best matches the font spec