From 089a38826365adbd8153318eb740c6b44cb9c49d Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Thu, 31 Oct 2002 21:10:47 +0000
Subject: [PATCH] Document --screen.

Wed Oct 30 16:50:42 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/running.sgml: Document --screen.
---
 docs/reference/ChangeLog                 |  4 ++++
 docs/reference/gtk/running.sgml          | 20 +++++++++++++++++++-
 docs/reference/gtk/tmpl/gtksettings.sgml | 15 +++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2d7a3d0a37..b2e6eb8a00 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 30 16:50:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/running.sgml: Document --screen.
+
 2002-10-24  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/tmpl/dnd.sgml: 
diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 21562a12b6..850ebe2305 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -117,12 +117,30 @@ This option is only available if GTK+ has been configured with
 
 <para>
 The name of the X display to open instead of the one specified
-in the <envar>DISPLAY</envar>. 
+in the <envar>DISPLAY</envar> environment variable. 
 This option is only available if GTK+ has been configured with
 <option>--gdk-target=x11</option>.
 </para>
 </formalpara>
 
+<formalpara>
+<title><systemitem>--screen <replaceable>screen_number</replaceable></systemitem></title>
+
+<para>
+  The number of the screen within the default display. This overrides
+  any screen number specified in the display name specified by
+  by he <systemitem>--display</systemitem> command line option or
+  the <envar>DISPLAY</envar> environment variable. If this screen
+  cannot be opened, then GTK+ will fall back to the screen
+  specified in the display name. This option is not useful
+  interactively; the intended purposes is that when a program
+  registers its command line with a <firstterm>session
+  manager</firstterm> for later restarting, it can save the
+  screen it is on, without having to worry if it might be
+  restarted on a different display.
+</para>
+</formalpara>
+
 <formalpara>
 <title><systemitem>--sync</systemitem></title>
 
diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index 0a20182b15..9b4b5cc451 100644
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -224,11 +224,26 @@ GtkSettings
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-menu-bar-popout-delay ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-can-change-accels ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-menu-popout-delay ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkSettings:gtk-menu-submenu-hysteresis ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-toolbar-style ##### -->
 <para>