# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1283625384 14400
# Node ID 8470d7e423afeef0688d1192703f49efc0922cf9
# Parent  8084d216adf56d771e077009eeb3f1a20466d34c
Revert last change.

diff -r 8084d216adf5 -r 8470d7e423af doc/lispref/ChangeLog
--- a/doc/lispref/ChangeLog	Sat Sep 04 14:21:48 2010 -0400
+++ b/doc/lispref/ChangeLog	Sat Sep 04 14:36:24 2010 -0400
@@ -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 -r 8084d216adf5 -r 8470d7e423af doc/lispref/frames.texi
--- a/doc/lispref/frames.texi	Sat Sep 04 14:21:48 2010 -0400
+++ b/doc/lispref/frames.texi	Sat Sep 04 14:36:24 2010 -0400
@@ -623,10 +623,6 @@
 
 @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 @@
 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 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.)