summaryrefslogtreecommitdiffstats
path: root/man/pulse-daemon.conf.5.xml.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-11-21 23:03:19 +0000
committerLennart Poettering <lennart@poettering.net>2007-11-21 23:03:19 +0000
commit6b932f0a50a8459399a8b79eb91132c8bacf22b9 (patch)
treeb26812197d7f00c6a32de29fda7bb3bfd4c26052 /man/pulse-daemon.conf.5.xml.in
parent40db06de5f49c3fa50599e746e63aca00f07c889 (diff)
update man pages a bit
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2070 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'man/pulse-daemon.conf.5.xml.in')
-rw-r--r--man/pulse-daemon.conf.5.xml.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 88bf8f58..2768e24e 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -102,6 +102,12 @@ USA.
</option>
<option>
+ <p><opt>disable-remixing=</opt> Never upmix or downmix channels
+ to different channel maps. Instead, do a simple name-based
+ matching only.</p>
+ </option>
+
+ <option>
<p><opt>use-pid-file=</opt> Create a PID file in
<file>/tmp/pulse-$USER/pid</file>. Of this is enabled you may
use commands like <opt>--kill</opt> or <opt>--check</opt>. If