diff options
Diffstat (limited to 'doc/faq')
| -rw-r--r-- | doc/faq/Makefile.am | 49 | ||||
| -rw-r--r-- | doc/faq/faq.docbook (renamed from doc/faq/faq.sgml) | 32 |
2 files changed, 35 insertions, 46 deletions
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 6090fd272..782f618c1 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -3,20 +3,14 @@ include $(top_srcdir)/misc/Makefile.common doc_DATA = faq.txt html_DATA = faq.html -EXTRA_DIST = README faq.sgml $(doc_DATA) $(html_DATA) +EXTRA_DIST = README faq.docbook $(doc_DATA) $(html_DATA) -docs: $(doc_DATA) $(html_DATA) +DISTCLEANFILES = $(doc_DATA) $(html_DATA) -distclean-local: clean-docs - -docs-prepare: $(srcdir)/faq.sgml - if test "$(srcdir)" != "." -a "$(srcdir)" != "`pwd`"; then \ - test -f ./faq.sgml -a ./faq.sgml -nt $(srcdir)/faq.sgml || cp $^ . ; \ - fi +docs: $(hackersguide_DATA) clean-docs: - rm -f $(doc_DATA) $(html_DATA) - test "x$(srcdir)" = x. || rm -f faq.sgml + rm -f $(hackersguide_DATA) dist-hook: @if test x"$(distcheck_lax)" = x ; then \ @@ -25,38 +19,23 @@ dist-hook: $(MAKE) docs ; \ fi -if HAVE_SGMLTOOLS -faq.html: faq.sgml - @$(MAKE) docs-prepare - $(SGMLTOOLS) -b onehtml faq.sgml; -else -faq.html: faq.sgml - @$(MAKE) docs-prepare - if test x"$(fail_if_missing)" = x"yes"; then \ - echo "Please install sgmltools-lite."; \ - exit 1; \ - fi - if test x"$(fail_if_missing)" != x"yes"; then \ - touch $@; \ - sleep 1; \ - touch $(notdir $^); \ - fi -endif +distclean-local: clean-docs + +if HAVE_XMLTO +faq.html: faq.docbook + xmlto html-nochunks $^ -if HAVE_SGMLTOOLS -faq.txt: faq.sgml - @$(MAKE) docs-prepare - $(SGMLTOOLS) -b txt faq.sgml; +faq.txt: faq.docbook + xmlto txt $^ else -faq.txt: faq.sgml - @$(MAKE) docs-prepare +faq.html faq.txt: faq.docbook if test x"$(fail_if_missing)" = x"yes"; then \ - echo "Please install sgmltools-lite."; \ + echo "Please install xmlto."; \ exit 1; \ fi if test x"$(fail_if_missing)" != x"yes"; then \ touch $@; \ sleep 1; \ - touch $(notdir $^); \ + touch $^; \ fi endif diff --git a/doc/faq/faq.sgml b/doc/faq/faq.docbook index 59bc5cde6..7b8acd7a9 100644 --- a/doc/faq/faq.sgml +++ b/doc/faq/faq.docbook @@ -1,4 +1,6 @@ -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "/usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd" > <book> @@ -1144,6 +1146,10 @@ </ulink> </para> <para> + For recent kernels (2.6.x series) the raw devices are neither + needed nor supported anymore, so don't bother. + </para> + <para> To use raw devices, first connect a free raw device to your dvd device, use something like: <screen> <command>raw /dev/raw1 /dev/dvd</command></screen> @@ -1238,10 +1244,13 @@ <sect2 id="audiodrivers"> <title>What audio drivers does xine support? OSS? Alsa? Arts? Esd?</title> <para> - Currently xine support audio output via OSS (kernel audio drivers), - ALSA 0.9.x (ALSA 0.5.x is no longer supported), arts (KDE's sound daemon) - and esound (esd, gnome's sound daemon – not recommended because it has - serious issues with a/v sync). + Currently xine support audio output via OSS (Linux 2.4 and most + *BSD audio drivers), + ALSA 0.9 and 1.0 (ALSA 0.5.x is no longer supported), aRTs (KDE + 3's sound daemon), ESounD (esd, gnome's sound daemon not + recommended because it has serious issues with a/v sync), JACK, + PulseAudio, plus platform-specific output through Sun devices for + Solaris and NetBSD and Irix output. </para> </sect2> @@ -1311,7 +1320,8 @@ You can do this either in the config dialog while xine is running (press the config button on the xine panel and go to the AUDIO tab) or have it the complicated way by editing the config file yourself which is located - in your home directory in <filename>.gxine</filename> or <filename>.xine</filename>: + in your home directory in <filename>.config/gxine</filename> or + <filename>.xine</filename>: <programlisting> audio.output.speaker_arrangement:Surround 4.0 audio.output.speaker_arrangement:Surround 4.1 @@ -1324,8 +1334,8 @@ <para> xine can do that too. Pretty much the same story as for 4-/5-channel surround (see above). You can either use the config dialog or edit - the config file (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>) - yourself: + the config file (<filename>~/.xine/config</filename> or + <filename>~/.config/gxine/config</filename>) yourself: <programlisting> audio.output.speaker_arrangement:Pass Through</programlisting> </para> </sect2> @@ -1846,7 +1856,7 @@ </para> <para> Drivers that access hardware directly includes VIDIX (warning: requires - root priviledges or kernel helper) and SyncFB (requires kernel helper – Matrox only). + root priviledges or kernel helper). User may try one of those, but should be warned that with root access they can cause the system to crash hard. The support is also limited to a couple of graphics cards only. @@ -1886,8 +1896,8 @@ </para> <para> Unscaled OSD usage by subtitles and xine-ui is controlled by - the following settings - (<filename>~/.xine/config</filename> or <filename>~/.gxine/config</filename>): + the following settings (<filename>~/.xine/config</filename> or + <filename>~/.config/gxine/config</filename>): <programlisting> gui.osd_use_unscaled:0</programlisting> <programlisting> subtitles.separate.use_unscaled_osd:0</programlisting> </para> |