Merge branch 'backport' into work

[dana/openbox.git] / doc / openbox.1.sgml

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 70766ba..6921a66 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -30,8 +30,8 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Next generation, highly configurable window manager
-      </refpurpose>
+    <refpurpose>A minimalistic, highly configurable, next generation window
+      manager with extensive standards support.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -40,6 +40,7 @@ manpage.1: manpage.sgml
       <arg><option>--version</option></arg>
       <arg><option>--replace</option></arg>
       <arg><option>--reconfigure</option></arg>
+      <arg><option>--restart</option></arg>
       <arg><option>--sm-disable</option></arg>
       <arg><option>--sync</option></arg>
       <arg><option>--debug</option></arg>
@@ -50,9 +51,8 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>DESCRIPTION</title>
 
-    <para>Openbox is a next generation, highly
-      configurable window manager. Openbox is compliant with the
-      latest window manager standards.</para>
+    <para>Openbox is minimalistic, highly configurable, next generation window
+      manager with extensive standards support.</para>
 
     <para>You can start Openbox in three ways:</para>
 
@@ -91,9 +91,7 @@ manpage.1: manpage.sgml
 
     <para>You can use the <command>obconf</command> tool to configure Openbox
       easily with a graphical interface, however more in-depth configuration
-      is possible by editing the configuration files by hand. Please note that
-      <command>obconf</command> older than version 2.0 may not work at all
-      for you.</para>
+      is possible by editing the configuration files by hand.</para>
 
     <para>The default configuration and menu files are installed in
       @configdir@/openbox/, and the user configuration is placed in
@@ -131,6 +129,14 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--restart</option></term>
+        <listitem>
+          <para>If Openbox is already running on the display, tell it to
+            restart. This is useful if you have upgraded Openbox and don't
+            want to restart X.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--sm-disable</option></term>
         <listitem>
           <para>Do not connect to the session manager.</para>
@@ -167,11 +173,11 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>obconf (1), openbox-gnome-session (1), openbox-kde-session (1).
-      </para>
+    <para>obconf (1), openbox-session(1), openbox-gnome-session(1),
+      openbox-kde-session(1).</para>
 
     <para>The program's full documentation is available on the website:
-      <literal>http://openbox.org/</literal></para>
+      <literal>http://icculus.org/openbox/</literal></para>
 
     <para>Please report bugs to: <literal>http://bugzilla.icculus.org/
       </literal></para>