From 6b932f0a50a8459399a8b79eb91132c8bacf22b9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Nov 2007 23:03:19 +0000
Subject: update man pages a bit

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2070 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 man/pulse-daemon.conf.5.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'man/pulse-daemon.conf.5.xml.in')

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
@@ -101,6 +101,12 @@ USA.
       overwrite or allow overwriting of the resampler to use.</p>
     </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
-- 
cgit