man: update man pages to only refer to the new place for the configuration files

This commit is contained in:
Lennart Poettering 2012-05-15 23:24:09 +02:00
parent 4c195bcc9d
commit 4bc865ad6e
6 changed files with 13 additions and 13 deletions

View file

@ -24,14 +24,14 @@ USA.
<manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script"> <manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script">
<synopsis> <synopsis>
<p><file>~/.pulse/default.pa</file></p> <p><file>~/.config/pulse/default.pa</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p> <p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
</synopsis> </synopsis>
<description> <description>
<p>The PulseAudio sound server interprets the file <p>The PulseAudio sound server interprets the file
<file>~/.pulse/default.pa</file> on startup, and when that file <file>~/.config/pulse/default.pa</file> on startup, and when that file
doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It doesn't exist <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. It
should contain directives in the PulseAudio CLI languages, as should contain directives in the PulseAudio CLI languages, as
documented in <manref name="pulse-cli-syntax" section="5"/>.</p> documented in <manref name="pulse-cli-syntax" section="5"/>.</p>

View file

@ -83,7 +83,7 @@ USA.
sink, source configuration to the X11 root window. This takes sink, source configuration to the X11 root window. This takes
the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE
environment variables and combines them with the data from environment variables and combines them with the data from
<file>~/.pulse/client.conf</file> (or <file>~/.config/pulse/client.conf</file> (or
<file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file> if that file does not <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file> if that file does not
exist). If specific options are passed on the command line exist). If specific options are passed on the command line
(<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see (<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see

View file

@ -24,7 +24,7 @@ USA.
<manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax"> <manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax">
<synopsis> <synopsis>
<p><file>~/.pulse/default.pa</file></p> <p><file>~/.config/pulse/default.pa</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p> <p><file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file></p> <p><file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file></p>
</synopsis> </synopsis>

View file

@ -24,14 +24,14 @@ USA.
<manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file"> <manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file">
<synopsis> <synopsis>
<p><file>~/.pulse/client.conf</file></p> <p><file>~/.config/pulse/client.conf</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p> <p><file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file></p>
</synopsis> </synopsis>
<description> <description>
<p>The PulseAudio client library reads configuration directives from <p>The PulseAudio client library reads configuration directives from
a file <file>~/.pulse/client.conf</file> on startup and when that a file <file>~/.config/pulse/client.conf</file> on startup and when that
file doesn't exist from file doesn't exist from
<file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p> <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p>

View file

@ -24,14 +24,14 @@ USA.
<manpage name="pulse-daemon.conf" section="5" desc="PulseAudio daemon configuration file"> <manpage name="pulse-daemon.conf" section="5" desc="PulseAudio daemon configuration file">
<synopsis> <synopsis>
<p><file>~/.pulse/daemon.conf</file></p> <p><file>~/.config/pulse/daemon.conf</file></p>
<p><file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file></p> <p><file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file></p>
</synopsis> </synopsis>
<description> <description>
<p>The PulseAudio sound server reads configuration directives from <p>The PulseAudio sound server reads configuration directives from
a file <file>~/.pulse/daemon.conf</file> on startup and when that a file <file>~/.config/pulse/daemon.conf</file> on startup and when that
file doesn't exist from file doesn't exist from
<file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>. Please note that the <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>. Please note that the
server also reads a configuration script on startup server also reads a configuration script on startup
@ -124,7 +124,7 @@ USA.
<option> <option>
<p><opt>use-pid-file=</opt> Create a PID file in the runtime directory <p><opt>use-pid-file=</opt> Create a PID file in the runtime directory
(<file>$HOME/.pulse/*-runtime/pid</file>). If this is enabled you may (<file>$XDG_RUNTIMEDIR/pulse/pid</file>). If this is enabled you may
use commands like <opt>--kill</opt> or <opt>--check</opt>. If use commands like <opt>--kill</opt> or <opt>--check</opt>. If
you are planning to start more than one PulseAudio process per you are planning to start more than one PulseAudio process per
user, you better disable this option since it effectively user, you better disable this option since it effectively
@ -276,7 +276,7 @@ USA.
<p><opt>default-script-file=</opt> The default configuration <p><opt>default-script-file=</opt> The default configuration
script file to load. Specify an empty string for not loading a script file to load. Specify an empty string for not loading a
default script file. The default behaviour is to load default script file. The default behaviour is to load
<file>~/.pulse/default.pa</file>, and if that file does not <file>~/.config/pulse/default.pa</file>, and if that file does not
exist fall back to the system wide installed version exist fall back to the system wide installed version
<file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. If run in system-wide <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>. If run in system-wide
mode the file <file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file> is used mode the file <file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file> is used

View file

@ -326,21 +326,21 @@ USA.
<section name="Files"> <section name="Files">
<p><file>~/.pulse/daemon.conf</file>, <p><file>~/.config/pulse/daemon.conf</file>,
<file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>: configuration settings <file>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>: configuration settings
for the PulseAudio daemon. If the version in the user's home for the PulseAudio daemon. If the version in the user's home
directory does not exist the global configuration file is directory does not exist the global configuration file is
loaded. See <manref name="pulse-daemon.conf" section="5"/> for loaded. See <manref name="pulse-daemon.conf" section="5"/> for
more information.</p> more information.</p>
<p><file>~/.pulse/default.pa</file>, <p><file>~/.config/pulse/default.pa</file>,
<file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>: the default configuration <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file>: the default configuration
script to execute when the PulseAudio daemon is started. If the script to execute when the PulseAudio daemon is started. If the
version in the user's home directory does not exist the global version in the user's home directory does not exist the global
configuration script is loaded. See <manref name="default.pa" configuration script is loaded. See <manref name="default.pa"
section="5"/> for more information.</p> section="5"/> for more information.</p>
<p><file>~/.pulse/client.conf</file>, <p><file>~/.config/pulse/client.conf</file>,
<file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>: configuration settings <file>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>: configuration settings
for PulseAudio client applications. If the version in the user's for PulseAudio client applications. If the version in the user's
home directory does not exist the global configuration file is home directory does not exist the global configuration file is