From ac2783e97354bc2647164b3e39dad139f9b975c7 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 20 May 2007 22:12:25 +0100 Subject: Make it clearer that the notes immediately below the MRL summary are important. --- doc/man/en/xine.5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 43768f8a1..51a66607e 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 -- cgit v1.2.3 From 66b40322a5be37a9a18472c731630b1edd7d46d2 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 20 May 2007 22:23:19 +0100 Subject: Mention other methods of getting the current dir; use shell quoting. --- doc/man/en/xine.5 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 51a66607e..08d7fd329 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -80,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 -- cgit v1.2.3 From be3166fe704bbfd9767e223fe834300f46d624ab Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 20 May 2007 22:33:29 +0100 Subject: Add stdout redirection to the example scan command. --- doc/man/en/xine.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 08d7fd329..3457af8a5 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -194,7 +194,7 @@ DVB MRLs require that ~/.xine/channels.conf exists 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.) -- cgit v1.2.3