Manual fixes for frame-background-mode.

* doc/custom.texi (Face Customization): Move discussion of face
inheritance here, from Faces section.

* doc/display.texi (Faces): Document frame-background-mode.

* doc/lispref/display.texi (Defining Faces): Move documentation of
frame-background-mode to the Emacs manual (Bug#7774).

2 files changed, 5 insertions, 8 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 52007d3493f..c262cecb02c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-05  Chong Yidong  <cyd@gnu.org>
+
+        * display.texi (Defining Faces): Move documentation of
+        frame-background-mode to the Emacs manual (Bug#7774).
+
 2012-08-04  Chong Yidong  <cyd@gnu.org>
 
         * syntax.texi (Syntax Basics): Rearrange the text for clarity.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 01d177feb87..64aa891e56b 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2040,14 +2040,6 @@ function, which is used to apply customized face settings.
 specify a face to use.  In the vast majority of cases, this is not
 necessary; it is preferable to simply use faces directly.
 
-@defopt frame-background-mode
-This option, if non-@code{nil}, specifies the background type to use for
-interpreting face definitions.  If it is @code{dark}, then Emacs treats
-all frames as if they had a dark background, regardless of their actual
-background colors.  If it is @code{light}, then Emacs treats all frames
-as if they had a light background.
-@end defopt
-
 @node Face Attributes
 @subsection Face Attributes
 @cindex face attributes