summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2012-01-14 16:19:14 +0200
committerTanu Kaskinen <tanuk@iki.fi>2012-02-12 17:32:50 +0200
commitdf0e46065cdeff1a4b991a03a8166d2f9c8f803a (patch)
tree99e3ab32d2f9723e1521d0bad47371451b9c93de /man
parent9c84f1274eb119a5175e7a22648e9d64696ccaaf (diff)
downloadpulseaudio-panda-df0e46065cdeff1a4b991a03a8166d2f9c8f803a.tar.gz
pulseaudio-panda-df0e46065cdeff1a4b991a03a8166d2f9c8f803a.tar.bz2
pulseaudio-panda-df0e46065cdeff1a4b991a03a8166d2f9c8f803a.zip
man: Document the local-server-type daemon.conf option.
Diffstat (limited to 'man')
-rw-r--r--man/pulse-daemon.conf.5.xml.in16
1 files changed, 16 insertions, 0 deletions
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 4ce238b9..5f647508 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -150,6 +150,22 @@ USA.
</option>
<option>
+ <p><opt>local-server-type=</opt> Please don't use this option if
+ you don't have to! This option is currently only useful when you
+ want D-Bus clients to use a remote server. This option may be
+ removed in future versions. If you only want to run Pulseaudio
+ in the system mode, use the <opt>system-instance</opt> option.
+ This option takes one of <opt>user</opt>, <opt>system</opt> or
+ <opt>none</opt> as the argument. This is essentially a duplicate
+ for the <opt>system-instance</opt> option. The difference is the
+ <opt>none</opt> option, which is useful when you want to use a
+ remote server with D-Bus clients. If both this and
+ <opt>system-instance</opt> are defined, this option takes
+ precedence. Defaults to whatever the <opt>system-instance</opt>
+ is set.</p>
+ </option>
+
+ <option>
<p><opt>enable-shm=</opt> Enable data transfer via POSIX
shared memory. Takes a boolean argument, defaults to
<opt>yes</opt>. The <opt>--disable-shm</opt> command line