From 35c826bb05140fc8e65903c3a91f8c8e6108e098 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 6 Feb 2014 16:08:50 +0100
Subject: [PATCH] man: improve man page and help for cmdline options

---
 man/pulseaudio.1.xml.in | 10 ++++++++--
 src/daemon/cmdline.c    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 12f05e8..3d5c2cd 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -181,6 +181,12 @@ USA.
     </option>
 
     <option>
+      <p><opt>--disallow-exit</opt><arg>[=BOOL]</arg></p>
+
+      <optdesc><p>Disallow user requested exit</p></optdesc>
+    </option>
+
+    <option>
       <p><opt>--exit-idle-time</opt><arg>=SECS</arg></p>
 
       <optdesc><p>Terminate the daemon when idle and the specified
@@ -209,7 +215,7 @@ USA.
     </option>
 
     <option>
-      <p><opt>-v</opt></p>
+      <p><opt>-v | --verbose</opt></p>
 
       <optdesc><p>Increase the configured verbosity level by one (see
       <opt>--log-level</opt> above). Specify multiple times to
@@ -249,7 +255,7 @@ USA.
     </option>
 
     <option>
-      <p><opt>--p | --dl-search-path</opt><arg>=PATH</arg></p>
+      <p><opt>-p | --dl-search-path</opt><arg>=PATH</arg></p>
 
       <optdesc><p>Set the search path for dynamic shared objects
       (plugins).</p></optdesc>
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 8fffda1..e158201 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -140,7 +140,7 @@ void pa_cmdline_help(const char *argv0) {
            "      --scache-idle-time=SECS           Unload autoloaded samples when idle and\n"
            "                                        this time passed\n"
            "      --log-level[=LEVEL]               Increase or set verbosity level\n"
-           "  -v                                    Increase the verbosity level\n"
+           "  -v  --verbose                         Increase the verbosity level\n"
            "      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
            "                                        Specify the log target\n"
            "      --log-meta[=BOOL]                 Include code location in log messages\n"
-- 
1.8.5.3