[pulseaudio-commits] 2 commits - man/default.pa.5.xml.in

[Tanu Kaskinen]

 man/default.pa.5.xml.in |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d6b892efdcfbc5961afd87fbdbd4752a264582db
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Fri Dec 4 07:38:20 2015 +0200

    man: remove a reference to pacmd from default.pa.5
    
    I don't want to have unnecessary advertising for pacmd, because I
    think pacmd should be deprecated.

diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index d999fb0..38bb725 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -39,9 +39,6 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
     <p>The script should contain directives in the PulseAudio CLI language, as
     documented in <manref name="pulse-cli-syntax" section="5"/>.</p>
-
-    <p>The same commands can also be entered during runtime in the <manref name="pacmd"
-      section="1"/> tool, allowing flexible runtime reconfiguration.</p>
   </description>
 
   <section name="Authors">

commit 8203423bdc8ce4bced0013817e8b864c6f3cd4d0
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Fri Dec 4 07:38:19 2015 +0200

    man: document when system.pa is used instead of default.pa

diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 306e976..d999fb0 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -23,15 +23,21 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
   <synopsis>
     <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>
 
   <description>
-    <p>The PulseAudio sound server interprets the 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 language, as
+    <p>The PulseAudio sound server interprets a configuration script on
+    startup, which is mainly used to define the set of modules to load. When
+    PulseAudio runs in the per-user mode and
+    <file>~/.config/pulse/default.pa</file> exists, that file is used. When
+    PulseAudio runs in the per-user mode and that file doesn't exist,
+    <file>@PA_DEFAULT_CONFIG_DIR@/default.pa</file> is used. When PulseAudio
+    runs as a system service, <file>@PA_DEFAULT_CONFIG_DIR@/system.pa</file> is
+    used.</p>
+
+    <p>The script should contain directives in the PulseAudio CLI language, as
     documented in <manref name="pulse-cli-syntax" section="5"/>.</p>
 
     <p>The same commands can also be entered during runtime in the <manref name="pacmd"