summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-01-08 21:18:15 +0100
committerLennart Poettering <lennart@poettering.net>2009-01-08 21:18:15 +0100
commitc2002dcd1f769e0a54976ad2d586a29c9316ffce (patch)
tree8f813de017886d395dd8741aa1cc794a6409d63a /man
parent9fc726c6d780f63610647014efeffab3a97b8dac (diff)
parent7ca0f384c8b122f6acb3547d20ca3a838507a038 (diff)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'man')
-rw-r--r--man/pulseaudio.1.xml.in6
1 files changed, 4 insertions, 2 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>