summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-05-20 22:52:25 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-05-20 22:52:25 +0100
commitf3dc4d7cd5776eceb4e8a10c63d34446e8837bd0 (patch)
treef60589df5323ee419c1912cb4840fb1b612d372d /doc
parent09791d6e7d1df1a3535dcf95a9f18e2301e062bf (diff)
downloadxine-lib-f3dc4d7cd5776eceb4e8a10c63d34446e8837bd0.tar.gz
xine-lib-f3dc4d7cd5776eceb4e8a10c63d34446e8837bd0.tar.bz2
Update the channels.conf location (using the XDG user config default).
Diffstat (limited to 'doc')
-rw-r--r--doc/README.dvb6
-rw-r--r--doc/man/en/xine.53
2 files changed, 5 insertions, 4 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/man/en/xine.5 b/doc/man/en/xine.5
index 3457af8a5..acf1b5109 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -190,7 +190,8 @@ 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