diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 01:08:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 01:08:23 +0000 |
| commit | b5887dafca2631646384b089b6ee45dc51c76405 (patch) | |
| tree | 08e074612cbc06a3c5827cebbac5b41d8852b43c /doc | |
| parent | 1c4e2a1b547e26f48b5797edcf54c43ba6f6e213 (diff) | |
| parent | 08765c20628cd7a38b53871390b91b16f30e8f9c (diff) | |
| download | xine-lib-b5887dafca2631646384b089b6ee45dc51c76405.tar.gz xine-lib-b5887dafca2631646384b089b6ee45dc51c76405.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/en/xine.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 2c267f5d3..c5c6600de 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -266,7 +266,7 @@ Text subtitle files may be appended to the MRL:. This is the normal way to define the subtitle file to use. The frontend will not take any notice of the subtitle file. For example: .br -.I file://home/user/wibble.mpg#subtitles:/home/user/wibble.sub +.I file://home/user/wibble.mpg#subtitle:/home/user/wibble.sub .br (Note that some front ends can detect subtitles files where the name differs as shown in the example.) |