diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /man/pulse-daemon.conf.5.xml.in | |
| parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'man/pulse-daemon.conf.5.xml.in')
| -rw-r--r-- | man/pulse-daemon.conf.5.xml.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in index 82c2b8e5..e6b1e190 100644 --- a/man/pulse-daemon.conf.5.xml.in +++ b/man/pulse-daemon.conf.5.xml.in @@ -133,11 +133,11 @@ USA. </option> <option> - <p><opt>cpu-limit=</opt> If disabled d not install the CPU load + <p><opt>cpu-limit=</opt> If disabled do not install the CPU load limiter, even on platforms where it is supported. This option is useful when debugging/profiling PulseAudio to disable disturbing SIGXCPU signals. Takes a boolean argument, defaults to - <opt>yes</opt>. The <opt>--no-cpu-limit</opt> command line + <opt>no</opt>. The <opt>--no-cpu-limit</opt> command line argument takes precedence.</p> </option> |