From 37f99fa644f5dab533053755ccac55ea7daf5c22 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 20 Feb 2008 21:45:48 +0000 Subject: Add a subtitles example to xine(5). --HG-- extra : transplant_source : %CA%CAD%2A%E6%5E%18Y%CB%29%D8%93R%0C%D4%F6%86j%82%F5 --- doc/man/en/xine.5 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 7a9357640..d5b0b5afe 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -263,7 +263,12 @@ Text subtitle files may be appended to the MRL:. .TP .BI #subtitle: This is the normal way to define the subtitle file to use. The frontend will -not take any notice of the subtitle file. +not take any notice of the subtitle file. For example: +.br +.I file://home/user/wibble.mpg#subtitles:/home/user/wibble.sub +.br +(Note that some front ends can detect subtitles files where the name differs +as shown in the example.) .br .SH STREAM OPTIONS .br -- cgit v1.2.3 From 2e5c9c79a47efe0df60aaea17569ea9f32d347a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 26 Feb 2008 00:19:13 +0100 Subject: Use dist_doc_DATA rather than setting EXTRA_DIST for documentation. --- doc/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/Makefile.am b/doc/Makefile.am index 1a757a4ca..070ef5a1e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,13 +2,11 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = man hackersguide faq -doc_DATA = README README.dvb README.dxr3 \ +dist_doc_DATA = README README.dvb README.dxr3 \ README.freebsd README.irix README.network_dvd README.opengl \ README.solaris README.syncfb README_xxmc.html README.MINGWCROSS \ README.WIN32 -EXTRA_DIST = $(doc_DATA) - docs clean-docs: @cd faq && $(MAKE) $@ @cd hackersguide && $(MAKE) $@ -- cgit v1.2.3