From 2c0016aaf239e08074abd4f5e3fb317dadb72aa1 Mon Sep 17 00:00:00 2001
From: Chengwei Yang <chengwei.yang@intel.com>
Date: Sun, 23 Jun 2013 10:49:09 +0800
Subject: [PATCH 2/5] dbus-launch: align document

Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
---
 doc/dbus-launch.1.xml.in |   21 ++++++++++++++++++---
 tools/dbus-launch.c      |    5 ++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/doc/dbus-launch.1.xml.in b/doc/dbus-launch.1.xml.in
index 727495b..31dd6ea 100644
--- a/doc/dbus-launch.1.xml.in
+++ b/doc/dbus-launch.1.xml.in
@@ -20,10 +20,14 @@
 <!-- body begins here -->
 <refsynopsisdiv id='synopsis'>
 <cmdsynopsis>
-  <command>dbus-launch</command>    <arg choice='opt'>--version </arg>
+  <command>dbus-launch</command>
+    <arg choice='opt'>--version </arg>
+    <arg choice='opt'>--help </arg>
     <arg choice='opt'>--sh-syntax </arg>
     <arg choice='opt'>--csh-syntax </arg>
     <arg choice='opt'>--auto-syntax </arg>
+    <arg choice='opt'>--binary-syntax </arg>
+    <arg choice='opt'>--close-stderr </arg>
     <arg choice='opt'>--exit-with-session </arg>
     <arg choice='opt'>--autolaunch=<replaceable>MACHINEID</replaceable></arg>
     <arg choice='opt'>--config-file=<replaceable>FILENAME</replaceable></arg>
@@ -175,8 +179,12 @@ no real reason to use it outside of the libdbus implementation anyhow.</para>
   <listitem>
 <para>Choose --csh-syntax or --sh-syntax based on the SHELL environment variable.</para>
 
-<para><option>--binary-syntax</option>
-Write to stdout a nul-terminated bus address, then the bus PID as a
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>--binary-syntax</option></term>
+  <listitem>
+<para>Write to stdout a nul-terminated bus address, then the bus PID as a
 binary integer of size sizeof(pid_t), then the bus X window ID as a
 binary integer of size sizeof(long). Integers are in the machine's
 byte order, not network byte order or any other canonical byte order.</para>
@@ -244,6 +252,13 @@ use it manually. It may change in the future.</para>
 
   </listitem>
   </varlistentry>
+  <varlistentry>
+  <term><option>--help</option></term>
+  <listitem>
+<para>Print the help info of dbus-launch</para>
+
+  </listitem>
+  </varlistentry>
 </variablelist>
 </refsect1>
 
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 49da17b..f34072a 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -182,7 +182,10 @@ verbose (const char *format,
 static void
 usage (int ecode)
 {
-  fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax] [--csh-syntax] [--auto-syntax] [--exit-with-session]\n");
+  fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax]"
+           " [--csh-syntax] [--auto-syntax] [--binary-syntax] [--close-stderr]"
+           " [--exit-with-session] [--autolaunch=MACHINEID]"
+           " [--config-file=FILENAME] [PROGRAM] [ARGS...]\n");
   exit (ecode);
 }
 
-- 
1.7.9.5