[Gnash-commit] gnash ChangeLog doc/C/gnashrc.xml doc/C/interna...

[Ann Barcomb]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Ann Barcomb <ann>       06/12/07 11:57:23

Modified files:
        .              : ChangeLog 
        doc/C          : gnashrc.xml internals.xml 

Log message:
        Explicitly documented that there are two sound support 
        settings. Addresses documentation task #6129.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1874&r2=1.1875
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnashrc.xml?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -b -r1.1874 -r1.1875
--- ChangeLog   7 Dec 2006 11:52:39 -0000       1.1874
+++ ChangeLog   7 Dec 2006 11:57:23 -0000       1.1875
@@ -1,3 +1,9 @@
+2006-12-07 Ann Barcomb <address@hidden>
+
+        * doc/C/internals.xml, gnashrc.xml:
+          Explicitly documented that there are two sound support 
+          settings. Addresses documentation task #6129.
+
 2006-12-07 Sandro Santilli <address@hidden>
 
        * server/: movie_root.cpp, sprite_instance.cpp:

Index: doc/C/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnashrc.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/C/gnashrc.xml   20 Nov 2006 17:12:07 -0000      1.4
+++ doc/C/gnashrc.xml   7 Dec 2006 11:57:23 -0000       1.5
@@ -109,26 +109,30 @@
        </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry id="standalonesound">
        <term>sound</term>
        <listitem>
          <para>
            This value can be set to either <emphasis>on</emphasis> or
            <emphasis>off</emphasis>, and controls the sound of the
            standalone player. By default Gnash enables playing the
-           sound in any Flash movie.
+           sound in any Flash movie.  Refer to
+            <emphasis><link 
linkend="pluginsound">pluginsound</link></emphasis> 
+            to control sound for the browser plugin.
          </para>
        </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry id="pluginsound">
        <term>pluginsound</term>
        <listitem>
          <para>
            This value can be set to either <emphasis>on</emphasis> or
            <emphasis>off</emphasis>, and controls the sound of the
            player when running as a browser plugin. By default, sound
-           is enabled when using Gnash as a browser plugin.
+           is enabled when using Gnash as a browser plugin.  Refer to
+            <emphasis><link linkend="standalonesound">sound</link></emphasis> 
+            for information about standalone player sound control.
          </para>
        </listitem>
       </varlistentry>

Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- doc/C/internals.xml 5 Dec 2006 10:18:10 -0000       1.41
+++ doc/C/internals.xml 7 Dec 2006 11:57:23 -0000       1.42
@@ -1738,6 +1738,14 @@
       will be made.
     </para>
 
+    <para>
+      There are two different settings related to sound support:
+      <emphasis><link linkend="pluginsound">pluginsound</link></emphasis> and 
+      <emphasis><link linkend="standalonesound">sound</link></emphasis>. 
+      This was done in order to allow the plugin to be independently 
+      configured, for instance to block sound from advertisements.
+    </para>
+
     <sect3 id="soundtypes">
       <title>Sound types</title>
       <para>