Revert last change.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 39609104d0f4d4885bd096c697b88b557a48ef34..399c07d13f5c6ee6b38d3602d3ecb950b2b43903 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,7 +1,3 @@
-2010-09-04  Chong Yidong  <cyd@stupidchicken.com>
-
-       * frames.texi (Layout Parameters): Add cindex entries (Bug#6929).
-
 2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * modes.texi (Defining Minor Modes): Doc fix (Bug#6880).

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 12c8c94d7820252ae788a4776ac2a2bd61e866c0..7dfe3242c5dfb23bafcaf91cc21f3a99583238b1 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -623,10 +623,6 @@ covers the whole screen.
 
 @node Layout Parameters
 @subsubsection Layout Parameters
-@cindex scroll bars, and frame parameters
-@cindex fringes, and frame parameters
-@cindex menu bars, and frame parameters
-@cindex tool bars, and frame parameters
 
   These frame parameters enable or disable various parts of the
 frame, or control their sizes.
@@ -643,6 +639,13 @@ Whether the frame has scroll bars for vertical scrolling, and which side
 of the frame they should be on.  The possible values are @code{left},
 @code{right}, and @code{nil} for no scroll bars.
 
+@ignore
+@item horizontal-scroll-bars
+Whether the frame has scroll bars for horizontal scrolling
+(non-@code{nil} means yes).  Horizontal scroll bars are not currently
+implemented.
+@end ignore
+
 @item scroll-bar-width
 The width of vertical scroll bars, in pixels, or @code{nil} meaning to
 use the default width.
@@ -670,7 +673,7 @@ menu bar.  @xref{Menu Bar}.  (The X toolkit and GTK allow at most one
 menu bar line; they treat larger values as 1.)
 
 @item tool-bar-lines
-      The number of lines to use for the tool bar.  A value of @code{nil}
+The number of lines to use for the tool bar.  A value of @code{nil}
 means don't display a tool bar.  (GTK and Nextstep allow at most one
 tool bar line; they treat larger values as 1.)