changeset 21689:43f41347aab0

Still some reformatting: - some (hopefully) more sane linebreaks - remove stray propmt from example

--- a/DOCS/xml/en/faq.xml	Wed Dec 20 20:30:08 2006 +0000
+++ b/DOCS/xml/en/faq.xml	Thu Dec 21 00:08:23 2006 +0000
@@ -155,7 +155,8 @@
 <qandaentry>
 <question><para>
 Building on Mac OS 10.3 leads to several link errors</para></question>
-<answer><para>
+<answer>
+<para>
 The link error you're experiencing most likely looks like this:
 <screen>
 ld: Undefined symbols:
@@ -169,29 +170,32 @@
 but not 10.3.
 One solution can be to downgrade to QuickTime 7.0.1.
 Here is a better solution.
-</para><para>
-Get an <ulink url="http://rapidshare.de/files/20281171/CompatFrameworks.tgz.html">older copy of the frameworks</ulink>.
+</para>
+<para>
+Get an
+<ulink url="http://rapidshare.de/files/20281171/CompatFrameworks.tgz.html">older copy of the frameworks</ulink>.
 This will give you a compressed file that contains the QuickTime
 7.0.1 Framework and a 10.3.9 QuartzCore Framework.
-</para><para>
+</para>
+<para>
 Uncompress the files somewhere that is not in your System folder.
 (i.e. do not install these frameworks into your
 <filename class="directory">/System/Library/Frameworks</filename>!
 Using this older copy is only meant to get around link errors!)
-<screen>
-gunzip &lt; CompatFrameworks.tgz | tar xvf -
-</screen>
+<screen>gunzip &lt; CompatFrameworks.tgz | tar xvf -</screen>
 In config.mak, you should append 
 <systemitem>-F/path/to/where/you/extracted</systemitem>
 to the <systemitem>OPTFLAGS</systemitem> variable.
 If you use <application>X-Code</application>, you can just select these
 frameworks instead of the system ones.
-</para><para>
+</para>
+<para>
 The resulting <application>MPlayer</application> binary will actually
 use the framework that is installed on your system via dynamic links that
 are resolved at run-time.
 (You can verify this using <systemitem>otool -l</systemitem>).
-</para></answer>
+</para>
+</answer>
 </qandaentry>
 </qandadiv>
 
@@ -384,9 +388,13 @@
 <answer><para>
 Are you using FVWM? Try the following:
 <orderedlist>
-<listitem><para>Start -> Settings -> Configuration -> Base Configuration</para></listitem>
-<listitem><para>Set <systemitem>Use Applications position hints</systemitem>
-to <systemitem>Yes</systemitem></para></listitem>
+<listitem><para>
+  Start -> Settings -> Configuration -> Base Configuration
+</para></listitem>
+<listitem><para>
+  Set <systemitem>Use Applications position hints</systemitem>
+  to <systemitem>Yes</systemitem>
+</para></listitem>
 </orderedlist>
 </para></answer>
 </qandaentry>
@@ -436,9 +444,7 @@
 Use the <systemitem>expand</systemitem> video filter to increase the
 area onto which the movie is rendered vertically and place the movie
 at the top border, for example:
-<screen>
-mplayer -vf expand=0:-100:0:0 -slang de dvd://1
-</screen>
+<screen>mplayer -vf expand=0:-100:0:0 -slang de dvd://1</screen>
 </para></answer>
 </qandaentry>
 
@@ -530,21 +536,21 @@
   </para>
   <procedure>
   <step><para>
-	Edit <filename>/etc/syconfig/prelink</filename> and change
-	<programlisting>PRELINK_OPTS=-mR</programlisting> to
-	<programlisting>PRELINK_OPTS="-mR --no-exec-shield"</programlisting>
+    Edit <filename>/etc/syconfig/prelink</filename> and change
+    <programlisting>PRELINK_OPTS=-mR</programlisting> to
+    <programlisting>PRELINK_OPTS="-mR --no-exec-shield"</programlisting>
   </para></step>
   <step><para>
     <command>touch /var/lib/misc/prelink.force</command>
   </para></step>
-  <step><para><command>/etc/cron.daily/prelink</command>
-  (This relinks all the applications, and it takes
-  quite a while.)
+  <step><para>
+    <command>/etc/cron.daily/prelink</command>
+    (This relinks all the applications, and it takes quite a while.)
   </para></step>
   <step><para>
     <command>execstack -s <replaceable>/path/to/</replaceable>mplayer</command>
     (This turns off exec-shield for the
-	<application>MPlayer</application> binary.)
+    <application>MPlayer</application> binary.)
   </para></step>
   </procedure>
 </listitem>
@@ -643,9 +649,7 @@
 <question><para>
 I've just installed <application>MPlayer</application>. When I want to
 open a video file it causes a fatal error:
-<screen>
-Error opening/initializing the selected video_out (-vo) device.
-</screen>
+<screen>Error opening/initializing the selected video_out (-vo) device.</screen>
 How can I solve my problem?
 </para></question>
 <answer><para>

--- a/DOCS/xml/en/install.xml	Wed Dec 20 20:30:08 2006 +0000
+++ b/DOCS/xml/en/install.xml	Thu Dec 21 00:08:23 2006 +0000
@@ -245,9 +245,13 @@
 configuration file (see the manual page for details).
 The second is to create a symlink called <filename>subfont.ttf</filename>
 to the font file of your choice. Either
-<screen>ln -s <replaceable>/path/to/sample_font.ttf</replaceable> ~/.mplayer/subfont.ttf</screen>
+<screen>
+ln -s <replaceable>/path/to/sample_font.ttf</replaceable> ~/.mplayer/subfont.ttf
+</screen>
 for each user individually or a system-wide one:
-<screen>ln -s <replaceable>/path/to/sample_font.ttf</replaceable> $PREFIX/share/mplayer/subfont.ttf</screen>
+<screen>
+ln -s <replaceable>/path/to/sample_font.ttf</replaceable> $PREFIX/share/mplayer/subfont.ttf
+</screen>
 </para>
 
 <para>
@@ -256,8 +260,9 @@
 won't work, instead <option>-font</option> expects a
 <systemitem class="library">fontconfig</systemitem> font name
 and defaults to the sans-serif font. Example:
-
-<screen>mplayer -font <replaceable>'Bitstream Vera Sans'</replaceable> <replaceable>anime.mkv</replaceable></screen>
+<screen>
+mplayer -font <replaceable>'Bitstream Vera Sans'</replaceable> <replaceable>anime.mkv</replaceable>
+</screen>
 </para>
 
 <para>
@@ -287,8 +292,12 @@
 <filename class="directory">$PREFIX/share/mplayer</filename>.
 Then rename or symlink one of the extracted directories to
 <filename class="directory">font</filename>, for example:
-<screen>ln -s <replaceable>~/.mplayer/arial-24</replaceable> ~/.mplayer/font</screen>
-<screen>ln -s <replaceable>$PREFIX/share/mplayer/arial-24</replaceable> $PREFIX/share/mplayer/font</screen>
+<screen>
+ln -s <replaceable>~/.mplayer/arial-24</replaceable> ~/.mplayer/font
+</screen>
+<screen>
+ln -s <replaceable>$PREFIX/share/mplayer/arial-24</replaceable> $PREFIX/share/mplayer/font
+</screen>
 </para>
 
 <para>
@@ -340,7 +349,7 @@
 </simpara></listitem>
 <listitem><para>
   start <application>MPlayer</application> by the following example:
-  <screen>$ mplayer -menu <replaceable>file.avi</replaceable></screen>
+  <screen>mplayer -menu <replaceable>file.avi</replaceable></screen>
   </para></listitem>
 <listitem><simpara>
   push any menu key you defined