From 4bc865ad6ea8e566cc95f6abb39d1028d9c652a1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 May 2012 23:24:09 +0200 Subject: man: update man pages to only refer to the new place for the configuration files --- man/default.pa.5.xml.in | 4 ++-- man/pax11publish.1.xml.in | 2 +- man/pulse-cli-syntax.5.xml.in | 2 +- man/pulse-client.conf.5.xml.in | 4 ++-- man/pulse-daemon.conf.5.xml.in | 8 ++++---- man/pulseaudio.1.xml.in | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'man') diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in index fb5b2d2df..815959341 100644 --- a/man/default.pa.5.xml.in +++ b/man/default.pa.5.xml.in @@ -24,14 +24,14 @@ USA. -

~/.pulse/default.pa

+

~/.config/pulse/default.pa

@PA_DEFAULT_CONFIG_DIR@/default.pa

The PulseAudio sound server interprets the file - ~/.pulse/default.pa on startup, and when that file + ~/.config/pulse/default.pa on startup, and when that file doesn't exist @PA_DEFAULT_CONFIG_DIR@/default.pa. It should contain directives in the PulseAudio CLI languages, as documented in .

diff --git a/man/pax11publish.1.xml.in b/man/pax11publish.1.xml.in index be9ce0b81..6ad20f7aa 100644 --- a/man/pax11publish.1.xml.in +++ b/man/pax11publish.1.xml.in @@ -83,7 +83,7 @@ USA. sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from - ~/.pulse/client.conf (or + ~/.config/pulse/client.conf (or @PA_DEFAULT_CONFIG_DIR@/client.conf if that file does not exist). If specific options are passed on the command line (-S, -O, -I, -c, see diff --git a/man/pulse-cli-syntax.5.xml.in b/man/pulse-cli-syntax.5.xml.in index dffb4a933..9d3f27829 100644 --- a/man/pulse-cli-syntax.5.xml.in +++ b/man/pulse-cli-syntax.5.xml.in @@ -24,7 +24,7 @@ USA. -

~/.pulse/default.pa

+

~/.config/pulse/default.pa

@PA_DEFAULT_CONFIG_DIR@/default.pa

@PA_DEFAULT_CONFIG_DIR@/system.pa

diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in index dc9ae0bd5..6243a3b27 100644 --- a/man/pulse-client.conf.5.xml.in +++ b/man/pulse-client.conf.5.xml.in @@ -24,14 +24,14 @@ USA. -

~/.pulse/client.conf

+

~/.config/pulse/client.conf

@PA_DEFAULT_CONFIG_DIR@/client.conf

The PulseAudio client library reads configuration directives from - a file ~/.pulse/client.conf on startup and when that + a file ~/.config/pulse/client.conf on startup and when that file doesn't exist from @PA_DEFAULT_CONFIG_DIR@/client.conf.

diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in index 79f970e6b..47318e221 100644 --- a/man/pulse-daemon.conf.5.xml.in +++ b/man/pulse-daemon.conf.5.xml.in @@ -24,14 +24,14 @@ USA. -

~/.pulse/daemon.conf

+

~/.config/pulse/daemon.conf

@PA_DEFAULT_CONFIG_DIR@/daemon.conf

The PulseAudio sound server reads configuration directives from - a file ~/.pulse/daemon.conf on startup and when that + a file ~/.config/pulse/daemon.conf on startup and when that file doesn't exist from @PA_DEFAULT_CONFIG_DIR@/daemon.conf. Please note that the server also reads a configuration script on startup @@ -124,7 +124,7 @@ USA.

use-pid-file= Create a PID file in the runtime directory - ($HOME/.pulse/*-runtime/pid). If this is enabled you may + ($XDG_RUNTIMEDIR/pulse/pid). If this is enabled you may use commands like --kill or --check. If you are planning to start more than one PulseAudio process per user, you better disable this option since it effectively @@ -276,7 +276,7 @@ USA.

default-script-file= The default configuration script file to load. Specify an empty string for not loading a default script file. The default behaviour is to load - ~/.pulse/default.pa, and if that file does not + ~/.config/pulse/default.pa, and if that file does not exist fall back to the system wide installed version @PA_DEFAULT_CONFIG_DIR@/default.pa. If run in system-wide mode the file @PA_DEFAULT_CONFIG_DIR@/system.pa is used diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in index 3b34f25f0..c556bda01 100644 --- a/man/pulseaudio.1.xml.in +++ b/man/pulseaudio.1.xml.in @@ -326,21 +326,21 @@ USA.

-

~/.pulse/daemon.conf, +

~/.config/pulse/daemon.conf, @PA_DEFAULT_CONFIG_DIR@/daemon.conf: configuration settings for the PulseAudio daemon. If the version in the user's home directory does not exist the global configuration file is loaded. See for more information.

-

~/.pulse/default.pa, +

~/.config/pulse/default.pa, @PA_DEFAULT_CONFIG_DIR@/default.pa: the default configuration script to execute when the PulseAudio daemon is started. If the version in the user's home directory does not exist the global configuration script is loaded. See for more information.

-

~/.pulse/client.conf, +

~/.config/pulse/client.conf, @PA_DEFAULT_CONFIG_DIR@/client.conf: configuration settings for PulseAudio client applications. If the version in the user's home directory does not exist the global configuration file is -- cgit v1.2.3