propagate changes to config entries

CVS patchset: 6495
CVS date: 2004/05/07 13:39:29

2 files changed, 9 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 12a20d07f..dc9e85b40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 xine-lib (1-rc4a)
-  * alsa audio out now uses a more user friendly "Speaker arrangement" config item.
+  * audio out now uses a more user friendly "Speaker arrangement" config item;
+    this defaults to stereo, so if you use a different speaker arragement, like
+    5.1 or other surround setups, you have to reconfigure xine using this item
   * fix possible crash in CDDB queries
   * work around the gnome-vfs sftp: method having a max read size of 256k,
     makes it possible to play AVIs over sftp:
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 3077cacc3..b5c619b42 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -1110,17 +1110,6 @@
     </para>
    </sect2>
 
-   <sect2 id="configoptions">
-    <title>What do all these <filename>~/.xine/config</filename> (<filename>~/.gxine/config</filename>) entries mean?</title>
-    <para>
-     You can find information about them in 
-     <filename>xine-lib/doc/README.config_en</filename>. 
-     Frontends may register additional config entries, you may find out more about
-     them in their documentation. Also the comments in the config file might
-     help.
-    </para>
-   </sect2>
-
    <sect2 id="dxr3">
     <title>Does xine support my dxr3 / hollywood+ card?</title>
     <para>
@@ -1216,9 +1205,9 @@
      the complicated way by editing the config file yourself which is located
      in your home directory in <filename>.gxine</filename> or <filename>.xine</filename>:
      <programlisting>
-&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:4
-&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:4.1
-&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:5.1</programlisting>
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:Surround 4.0
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:Surround 4.1
+&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:Surround 5.1</programlisting>
     </para>
    </sect2>
 
@@ -1229,7 +1218,7 @@
      surround (see above). You can either use the config dialog or edit
      the config file (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>)
      yourself:
-     <programlisting>&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:A52_Passthru</programlisting>
+     <programlisting>&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:Pass Through</programlisting>
     </para>
    </sect2>
 
@@ -1333,11 +1322,11 @@
      </para>
     </sect3>
     <sect3>
-     <title>Setting up xine for SPDIF (AC3_passthrough) output</title>
+     <title>Setting up xine for SPDIF (AC3 passthrough) output</title>
      <para>
       You can either use the config dialog of your frontend or edit
       the config file (<filename>~/.xine/config</filename>) yourself:
-      <programlisting>&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:A52_Passthru</programlisting>
+      <programlisting>&nbsp;&nbsp;&nbsp;audio.speaker_arrangement:Pass Through</programlisting>
       In case the setting is not in the file you can add it.
      </para>
     </sect3>