diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/.hgignore (renamed from doc/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/Makefile.am | 6 | ||||
| -rw-r--r-- | doc/faq/.hgignore (renamed from doc/faq/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/faq/Makefile.am | 11 | ||||
| -rw-r--r-- | doc/hackersguide/.hgignore (renamed from doc/hackersguide/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/hackersguide/Makefile.am | 10 | ||||
| -rw-r--r-- | doc/man/.hgignore (renamed from doc/man/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/man/en/.hgignore (renamed from doc/man/en/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/man/en/xine.5 | 4 |
9 files changed, 14 insertions, 17 deletions
diff --git a/doc/.cvsignore b/doc/.hgignore index 282522db0..282522db0 100644 --- a/doc/.cvsignore +++ b/doc/.hgignore diff --git a/doc/Makefile.am b/doc/Makefile.am index af97e86b2..1a757a4ca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = man hackersguide faq -docs_DATA = README README.dvb README.dxr3 \ +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 = $(docs_DATA) - -docsdir = $(prefix)/share/doc/xine +EXTRA_DIST = $(doc_DATA) docs clean-docs: @cd faq && $(MAKE) $@ diff --git a/doc/faq/.cvsignore b/doc/faq/.hgignore index 647d53c1d..647d53c1d 100644 --- a/doc/faq/.cvsignore +++ b/doc/faq/.hgignore diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 3dcbe44e5..6090fd272 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,12 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -docs_DATA = faq.html faq.txt +doc_DATA = faq.txt +html_DATA = faq.html -EXTRA_DIST = README faq.sgml $(docs_DATA) +EXTRA_DIST = README faq.sgml $(doc_DATA) $(html_DATA) -docsdir = $(prefix)/share/doc/xine/faq - -docs: $(docs_DATA) +docs: $(doc_DATA) $(html_DATA) distclean-local: clean-docs @@ -16,7 +15,7 @@ docs-prepare: $(srcdir)/faq.sgml fi clean-docs: - rm -f $(docs_DATA) + rm -f $(doc_DATA) $(html_DATA) test "x$(srcdir)" = x. || rm -f faq.sgml dist-hook: diff --git a/doc/hackersguide/.cvsignore b/doc/hackersguide/.hgignore index 28b4cdaa4..28b4cdaa4 100644 --- a/doc/hackersguide/.cvsignore +++ b/doc/hackersguide/.hgignore diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 086b7a67a..02a433299 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -12,15 +12,15 @@ hackersguide_fig = architecture.fig \ overlays.fig \ post_frame.fig -docs_DATA = hackersguide.html \ +hackersguide_DATA = hackersguide.html \ architecture.png library.png overlays.png post_frame.png EXTRA_DIST = README $(hackersguide_sgml) $(hackersguide_fig) \ - $(docs_DATA) + $(hackersguide_DATA) -docsdir = $(prefix)/share/doc/xine/hackersguide +hackersguidedir = $(htmldir)/hackersguide -docs: $(docs_DATA) +docs: $(hackersguide_DATA) distclean-local: clean-docs @@ -32,7 +32,7 @@ docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml)) fi clean-docs: - rm -f $(docs_DATA) + rm -f $(hackersguide_DATA) test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml) *.fig dist-hook: diff --git a/doc/man/.cvsignore b/doc/man/.hgignore index 282522db0..282522db0 100644 --- a/doc/man/.cvsignore +++ b/doc/man/.hgignore diff --git a/doc/man/en/.cvsignore b/doc/man/en/.hgignore index 282522db0..282522db0 100644 --- a/doc/man/en/.cvsignore +++ b/doc/man/en/.hgignore diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 817ca120b..0c4cedc12 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -31,7 +31,7 @@ to read from. Valid MRLs may be plain file names or one of the following: .TP \(bu CD and DVD: .br -.BI dvd:/[<DVD_image>|<device_name>][/<title>.<part>] +.BI dvd:/[<DVD_image>|<DVD_directory>|<device_name>][/<title>.<part>] .br .BI vcd://[<CD_image>|<device_name>][@[letter]<number>] .br @@ -52,7 +52,7 @@ to read from. Valid MRLs may be plain file names or one of the following: .br .BI dvbt://<channel_name>:<tuning_parameters> .br -.BI pvr://... "for WinTV PVR 250 and 350)" +.BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)" .LP .TP \(bu Network: |