From 4bc865ad6ea8e566cc95f6abb39d1028d9c652a1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 May 2012 23:24:09 +0200
Subject: [PATCH] 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(-)

diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index fb5b2d2d..81595934 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -24,14 +24,14 @@ USA.
 <manpage name="default.pa" section="5" desc="PulseAudio Sound Server Startup Script">
 
   <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>
   </synopsis>
 
   <description>
     <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
     should contain directives in the PulseAudio CLI languages, as
     documented in <manref name="pulse-cli-syntax" section="5"/>.</p>
diff --git a/man/pax11publish.1.xml.in b/man/pax11publish.1.xml.in
index be9ce0b8..6ad20f7a 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
-      <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
       exist). If specific options are passed on the command line
       (<opt>-S</opt>, <opt>-O</opt>, <opt>-I</opt>, <opt>-c</opt>, see
diff --git a/man/pulse-cli-syntax.5.xml.in b/man/pulse-cli-syntax.5.xml.in
index dffb4a93..9d3f2782 100644
--- a/man/pulse-cli-syntax.5.xml.in
+++ b/man/pulse-cli-syntax.5.xml.in
@@ -24,7 +24,7 @@ USA.
 <manpage name="pulse-cli-syntax" section="5" desc="PulseAudio Command Line Interface Syntax">
 
   <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@/system.pa</file></p>
   </synopsis>
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index dc9ae0bd..6243a3b2 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -24,14 +24,14 @@ USA.
 <manpage name="pulse-client.conf" section="5" desc="PulseAudio client configuration file">
 
   <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>
   </synopsis>
 
   <description>
     <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>@PA_DEFAULT_CONFIG_DIR@/client.conf</file>.</p>
 
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 79f970e6..47318e22 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -24,14 +24,14 @@ USA.
 <manpage name="pulse-daemon.conf" section="5" desc="PulseAudio daemon configuration file">
 
   <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>
   </synopsis>
 
   <description>
     <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>@PA_DEFAULT_CONFIG_DIR@/daemon.conf</file>. Please note that the
     server also reads a configuration script on startup
@@ -124,7 +124,7 @@ USA.
 
     <option>
       <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
       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.
       <p><opt>default-script-file=</opt> The default configuration
       script file to load. Specify an empty string for not loading a
       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
       <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
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 3b34f25f..c556bda0 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -326,21 +326,21 @@ USA.
 
   <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
     for the PulseAudio daemon. If the version in the user's home
     directory does not exist the global configuration file is
     loaded. See <manref name="pulse-daemon.conf" section="5"/> for
     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
     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 <manref name="default.pa"
     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
     for PulseAudio client applications. If the version in the user's
     home directory does not exist the global configuration file is
-- 
2.39.2