[pulseaudio-commits] 4 commits - man/default.pa.5.xml.in man/pulse-cli-syntax.5.xml.in src/pulsecore

[David Henningsson]

 man/default.pa.5.xml.in       |    2 +-
 man/pulse-cli-syntax.5.xml.in |   11 +++++------
 src/pulsecore/pstream.c       |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 592ba453e3505fd88b4f4151e918c457c4b6454c
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:07:32 2013 +0200

    doc: Reword description of meta commands in pulse-cli-syntax.5
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/man/pulse-cli-syntax.5.xml.in b/man/pulse-cli-syntax.5.xml.in
index 4784dba..92c7134 100644
--- a/man/pulse-cli-syntax.5.xml.in
+++ b/man/pulse-cli-syntax.5.xml.in
@@ -307,7 +307,7 @@ USA.
 
   <section name="Meta Commands">
     <p>
-      In addition the commands described above there a few meta directives
+      In addition to the commands described above there are a few meta directives
       supported by the command line interpreter.
     </p>
     <option>

commit 5701e83191d77e6bca05f1a036bb6aaa21eb0792
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:07:31 2013 +0200

    doc: Fix description how boolean values can be specified
    
    "any word starting with the letters" parts; this does not hold
    any longer with commit 0e29e7365907ffbe90df768a4dea277dba40d495
    core-util: Don't accept random words in pa_parse_boolean()
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/man/pulse-cli-syntax.5.xml.in b/man/pulse-cli-syntax.5.xml.in
index 3c21f7a..4784dba 100644
--- a/man/pulse-cli-syntax.5.xml.in
+++ b/man/pulse-cli-syntax.5.xml.in
@@ -32,16 +32,15 @@ USA.
   <description>
     <p>
       PulseAudio provides a simple command line language used by configuration
-      scripts and the pacmd interactive shell, and the modules module-cli and
+      scripts, the pacmd interactive shell, and the modules module-cli and
       module-cli-protocol-{unix,tcp}. Empty lines and lines beginning with a
       hashmark (#) are silently ignored. Several commands are supported.
     </p>
 
     <p>
-      Note that any boolean arguments can be given positively as '1', 'on' or any
-      word starting with the letters 't' or 'y'. Likewise, negative values can be
-      given as '0', 'off' or any word starting with the letters 'f' or 'n'.
-      Case is ignored.
+      Note that any boolean arguments can be given positively as '1', 't', 'y',
+      'true', 'yes' or 'on'. Likewise, negative values can be given as '0',
+      'f', 'n', 'false', 'no' or 'off'. Case is ignored.
     </p>
   </description>
 

commit e87fbc7e862d017a0882e2a73925e3de2383405b
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:07:30 2013 +0200

    doc: Mention just one CLI language in default.pa.5
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/man/default.pa.5.xml.in b/man/default.pa.5.xml.in
index 8159593..5690541 100644
--- a/man/default.pa.5.xml.in
+++ b/man/default.pa.5.xml.in
@@ -33,7 +33,7 @@ USA.
     <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 languages, as
+    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"

commit f1d19935b46907cb74d6b9d1d772845a138fc87a
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Apr 17 15:16:36 2013 +0200

    pstream: Fix case in log message
    
    Signed-off-by: Peter Meerwald <p.meerwald at bct-electronic.com>

diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index d92178f..9463437 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -754,7 +754,7 @@ static int do_read(pa_pstream *p) {
             if ((flags & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA) {
 
                 if (length != sizeof(p->read.shm_info)) {
-                    pa_log_warn("Received SHM memblock frame with Invalid frame length.");
+                    pa_log_warn("Received SHM memblock frame with invalid frame length.");
                     return -1;
                 }