diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
| commit | bcaba0b1b43d6a1b32aadfa98860f40b2c93e136 (patch) | |
| tree | 6bd0d60a8fa822bfd688b90d062d0f73eee2e47e /man/pulse-client.conf.5.xml.in | |
| parent | 2bb3eef414f80189cf6af6cd66c519630e4c0a43 (diff) | |
| parent | 01e4b61a910afdd21f860fadbe98075735c2bf51 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulsecore/namereg.c
Diffstat (limited to 'man/pulse-client.conf.5.xml.in')
| -rw-r--r-- | man/pulse-client.conf.5.xml.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in index 26e38908..46cc8450 100644 --- a/man/pulse-client.conf.5.xml.in +++ b/man/pulse-client.conf.5.xml.in @@ -92,9 +92,9 @@ USA. </option> <option> - <p><opt>disable-shm=</opt> Disable data transfer via POSIX + <p><opt>enable-shm=</opt> Enable data transfer via POSIX shared memory. Takes a boolean argument, defaults to - <opt>no</opt>.</p> + <opt>yes</opt>.</p> </option> <option> |