summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/pulseaudio.1.xml.in6
-rw-r--r--src/daemon/cmdline.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index df828242..8810e90c 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -72,7 +72,7 @@ USA.
</option>
<option>
- <p><opt>--dump-resampe-methods</opt></p>
+ <p><opt>--dump-resample-methods</opt></p>
<optdesc><p>List available audio resamplers.</p></optdesc>
</option>
@@ -110,7 +110,9 @@ USA.
<p><opt>--check</opt></p>
<optdesc><p>Return 0 as return code when the PulseAudio daemon
- is already running for the calling user.</p></optdesc>
+ is already running for the calling user, or non-zero
+ otherwise. Produces no output on the console except for errors
+ to stderr.</p></optdesc>
</option>
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 0bfc8a92..cc3d714b 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -130,7 +130,7 @@ void pa_cmdline_help(const char *argv0) {
" --cleanup-shm Cleanup stale shared memory segments\n"
" --start Start the daemon if it is not running\n"
" -k --kill Kill a running daemon\n"
- " --check Check for a running daemon\n\n"
+ " --check Check for a running daemon (only returns exit code)\n\n"
"OPTIONS:\n"
" --system[=BOOL] Run as system-wide instance\n"