Merge changes from main 1.2 tree

3 files changed, 17 insertions, 13 deletions

diff --git a/doc/README.dvb b/doc/README.dvb
index c04013330..9de8295aa 100644
--- a/doc/README.dvb
+++ b/doc/README.dvb
@@ -49,7 +49,7 @@ install a channel list
 xine's dvb input plugin needs a channel/transponder list that fits your 
 dvb equipment. xine now uses the channels.conf format of szap, czap and 
 tzap as appropriate for DVB-S, DVB-C and DVB-T. it will search the channel
-list file in ~/.xine/channels.conf
+list file in ~/.config/xine/channels.conf
 
 channel list format for DVB-S: (satellite)
 -------------------------------------------
@@ -72,11 +72,11 @@ which comes with the dvb package. compile it using something like
 
 then start scanning
 
-# scan >~/.xine/channels.conf
+# scan >~/.config/xine/channels.conf
 
 newer versions of scan (after July 2004) are called dvbscan, but you can use it much the same way:
 
-# dvbscan Hotbird-13.0 >~/.xine/channels.conf
+# dvbscan Hotbird-13.0 >~/.config/xine/channels.conf
 
 this can take a while. in a DiSEqC environment, use the -s N switch to select
 different sattelites to scan and paste the results in one big channels.conf file.  As always,
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 9743cf361..db1762f51 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -1316,7 +1316,8 @@
      You can do this either in the config dialog while xine is running (press
      the config button on the xine panel and go to the AUDIO tab) or have it
      the complicated way by editing the config file yourself which is located
-     in your home directory in <filename>.gxine</filename> or <filename>.xine</filename>:
+     in your home directory in <filename>.config/gxine</filename> or
+     <filename>.xine</filename>:
      <programlisting>
 &nbsp;&nbsp;&nbsp;audio.output.speaker_arrangement:Surround 4.0
 &nbsp;&nbsp;&nbsp;audio.output.speaker_arrangement:Surround 4.1
@@ -1329,8 +1330,8 @@
     <para>
      xine can do that too. Pretty much the same story as for 4-/5-channel
      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:
+     the config file (<filename>~/.xine/config</filename> or
+     <filename>~/.config/gxine/config</filename>) yourself:
      <programlisting>&nbsp;&nbsp;&nbsp;audio.output.speaker_arrangement:Pass Through</programlisting>
     </para>
    </sect2>
@@ -1858,8 +1859,8 @@
     </para>
     <para>
      Unscaled OSD usage by subtitles and xine-ui is controlled by 
-     the following settings
-     (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>):
+     the following settings (<filename>~/.xine/config</filename> or
+     <filename>~/.config/gxine/config</filename>):
      <programlisting>&nbsp;&nbsp;&nbsp;gui.osd_use_unscaled:0</programlisting>
      <programlisting>&nbsp;&nbsp;&nbsp;subtitles.separate.use_unscaled_osd:0</programlisting>
     </para>
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index 43768f8a1..acf1b5109 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -18,7 +18,8 @@
 xine \- a free video player
 .SH MRL (media resource locator)
 MRLs are similar to URLs in your web browser. They describe the media
-to read from. Valid MRLs may be plain file names or one of the following:
+to read from. Valid MRLs may be plain file names or one of the following
+(see also the notes below):
 .TP
 \(bu Filesystem:
 .br
@@ -79,8 +80,9 @@ to read from. Valid MRLs may be plain file names or one of the following:
 .br
 .LP
 \fBNOTE:\fP where a file name is required, the \fIfull path must be
-provided\fP - from a shell, you can use \fB$PWD/file\fP if the file
-is in the current directory.
+provided\fP - from a shell, you can use \fB"$PWD/file"\fP or
+\fB"$(pwd)/file"\fP or \fB"\`pwd\`/file"\fP if the file is in the current
+directory. (Which one depends on your shell; all three work in bash.)
 
 Several MRLs may be specified in order to play a number of consecutive
 streams. Additional input plugins will provide additional MRL types. The ones
@@ -188,11 +190,12 @@ Play entry 0 of /tmp/ntsc.nrg (Nero file). Works for some simple Nero images.
 .br
 .SS DVB
 .PP
-DVB MRLs require that ~/.xine/channels.conf exists and contains valid data.
+DVB MRLs require that xine-lib/channels.conf exists in $XDG_CONFIG_HOME/ or
+~/.config/ and contains valid data.
 This can be obtained by generating a tuning file using the LinuxTV DVB apps
 utility "scan" (or "dvbscan" if you're using a version newer than 1.1.0):
 .PP
-.B scan -o zap /usr/share/doc/dvb-utils/examples/scan/dvb-t/uk-PontopPike
+.B scan -o zap /usr/share/doc/dvb-utils/examples/scan/dvb-t/uk-PontopPike >~/.config/xine-lib/channels.conf
 .PP
 (This example is for the writer's local transmitter, using a file from the
 Debian dvb-utils package.)