# HG changeset patch
# User nicolas
# Date 1053091851 0
# Node ID a570a78537aa002b556ae84a4430ac13817cfa93
# Parent  0768c63a7bd3da2a44938570b55202d714d85aa2
various fixes and updates

diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/audio.xml
--- a/DOCS/xml/en/audio.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/audio.xml	Fri May 16 13:30:51 2003 +0000
@@ -55,7 +55,7 @@
 
 <para>
 Other media players like <ulink url="http://avifile.sourceforge.net">aviplay</ulink>
-or <ulink url="http://xine.sourceforge.net">xine</ulink> possibly work
+or <ulink url="http://xine.sourceforge.net">Xine</ulink> possibly work
 out-of-the-box with these drivers because they use "simple" methods
 with internal timing. Measuring showed that their methods are not as
 efficient as <application>MPlayer</application>'s.
@@ -596,7 +596,7 @@
 </para>
 
 <para>
-Exemple 2:
+Example 2:
 <screen>mplayer -af channels=6:4:0:0:0:1:0:2:0:3 media.avi</screen>
 would change the number of channels to 6 and set up 4 routes that copy
 channel 0 to channels 0 to 3. Channel 4 and 5 will contain silence.
@@ -643,7 +643,7 @@
 <sect4 id="af_delay">
 <title>Delay</title>
 <para>
-The <option>delay</option>  filter delays the sound to the loudspeakers such that
+The <option>delay</option> filter delays the sound to the loudspeakers such that
 the sound from the different channels arrives at the listening position
 simultaneously.
 It is only useful if you have more than 2 loudspeakers. This filter has a
@@ -677,7 +677,7 @@
     s[i] = max(s) - s[i]; i = 1...5
 </para></listitem>
 <listitem><para>
-alculated the required delays in ms as
+Calculated the required delays in ms as
     d[i] = 1000*s[i]/342; i = 1...5
     s[i] = max(s) - s[i]; i = 1...5
 </para></listitem>
@@ -863,7 +863,7 @@
 <sect4 id="af_sub">
 <title>Sub-woofer</title>
 <para>
-The <option>sub</option>  filter adds a sub woofer channel to the audio
+The <option>sub</option> filter adds a sub woofer channel to the audio
 stream. The audio data used for creating the sub-woofer channel is an
 average of the sound in channel 0 and channel 1. The resulting sound is
 then low-pass filtered by a 4th order Butterworth filter with a default
@@ -1108,8 +1108,8 @@
 
 <para>
 This plugin (linearly) increases the difference between left and right
-channels (like the XMMS extrastereo plugin) which gives some sort of "live"
-effect to playback.
+channels (like the <application>XMMS</application> extrastereo plugin) which gives some
+sort of "live" effect to playback.
 </para>
 
 <para>
diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/bugreports.xml
--- a/DOCS/xml/en/bugreports.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/bugreports.xml	Fri May 16 13:30:51 2003 +0000
@@ -77,9 +77,9 @@
 <ulink url="mailto:mplayer-users@mplayerhq.hu"/>
 </para>
 <para>
-The language of this list is English. Please follow the standard
+The language of this list is <emphasis role="bold">English</emphasis>. Please follow the standard
 <ulink url="http://www.ietf.org/rfc/rfc1855.txt">Netiquette Guidelines</ulink> and
-do not send HTML mail to any of our mailing lists. You will only get ignored or
+<emphasis role="bold">do not send HTML mail</emphasis> to any of our mailing lists. You will only get ignored or
 banned. If you do not know what HTML mail is or why it is evil, read this
 <ulink url="http://expita.com/nomime.html">fine document</ulink>. It explains all
 the details and has instructions for turning HTML off. Also note that we will not
@@ -126,6 +126,12 @@
 </screen>
 </para></listitem>
 <listitem><para>
+binutils version:
+<screen>
+as --version
+</screen>
+</para></listitem>
+<listitem><para>
 If you have problems with fullscreen mode:
   <itemizedlist>
     <listitem><para>Window manager type and version</para></listitem>
diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/history.xml
--- a/DOCS/xml/en/history.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/history.xml	Fri May 16 13:30:51 2003 +0000
@@ -81,7 +81,7 @@
   support for all known video formats!
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer 0.90 "?"</emphasis> Date yet unknown
+  <emphasis role="bold">MPlayer 0.90 "The CounterCounter"</emphasis> Apr 6, 2003
   </para></listitem>
 </itemizedlist>
 </para>
diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/skin.xml
--- a/DOCS/xml/en/skin.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/skin.xml	Fri May 16 13:30:51 2003 +0000
@@ -199,6 +199,22 @@
 </para>
 
 <para>
+Currently there is only one application, so you need only one section: its name is
+<emphasis role="bold">movieplayer</emphasis>.
+</para>
+
+<para>
+Within this section each window is described by a block of the following form:
+<programlisting>
+window = <replaceable>window name</replaceable>
+.
+.
+.
+end
+</programlisting>
+</para>
+
+<para>
 where <replaceable>window name</replaceable> can be one of these strings:
 <itemizedlist>
 <listitem><para><emphasis role="bold">main</emphasis> - for the main window</para></listitem>
@@ -434,7 +450,7 @@
   <listitem><para>
 Defines a font. <literal>fontfile</literal> is the name of a font description file
 with a <filename>.fnt</filename> extension (do not specify the extension here).
-fontid is used to refer to the font (see <link linkend="skin-dlabel">dlabel</link>
+<literal>fontid</literal> is used to refer to the font (see <link linkend="skin-dlabel">dlabel</link>
 and <link linkend="skin-slabel">slabel</link>). Up to 25 fonts can be defined.
     </para></listitem>
 </varlistentry>
diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/users-vs-dev.xml
--- a/DOCS/xml/en/users-vs-dev.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/users-vs-dev.xml	Fri May 16 13:30:51 2003 +0000
@@ -8,15 +8,15 @@
 <formalpara>
 <title>The background:</title>
 <para>
-The GCC <emphasis>2.95</emphasis> series is an official GNU release and
+The GCC <emphasis role="bold">2.95</emphasis> series is an official GNU release and
 version 2.95.3 of GCC is the most bug-free in that series.  We have never
 noticed compilation problems that we could trace to gcc-2.95.3. Starting
-with Red Hat Linux 7.0, <emphasis>Red Hat</emphasis> included a heavily
+with Red Hat Linux 7.0, <emphasis role="bold">Red Hat</emphasis> included a heavily
 patched CVS version of GCC in their distribution and named it
-<emphasis>2.96</emphasis>. Red Hat included this version in the
+<emphasis role="bold">2.96</emphasis>. Red Hat included this version in the
 distribution because GCC 3.0 was not finished at the time, and they needed
 a compiler that worked well on all of their supported platforms, including
-IA64 and s390. The Linux distributor <emphasis>Mandrake</emphasis> also
+IA64 and s390. The Linux distributor <emphasis role="bold">Mandrake</emphasis> also
 followed Red Hat's example and started shipping GCC 2.96 with their
 Linux-Mandrake 8.0 series.
 </para>
@@ -27,7 +27,7 @@
 <para>
 The GCC team disclaimed any link with GCC 2.96 and issued an
 <ulink url="http://gcc.gnu.org/gcc-2.96.html">official response</ulink>
-to GCC 2.96.  Many developers around the world began having problems with
+to GCC 2.96. Many developers around the world began having problems with
 GCC 2.96, and started recommending other compilers. Examples are
 <ulink url="http://www.mysql.com/downloads/mysql-3.23.html">MySQL</ulink>,
 <ulink url="http://avifile.sourceforge.net/news-old1.htm">avifile</ulink>
@@ -66,7 +66,7 @@
 longer. Hopefully a maturing GCC 3.x will solve the issue for good.  If you
 want to compile with 2.96 give the <option>--disable-gcc-checking</option>
 flag to <filename>configure</filename>. Remember that you are on your own
-and <emphasis>do not report any bugs</emphasis>. If you do, you will only
+and <emphasis role="bold">do not report any bugs</emphasis>. If you do, you will only
 get banned from our mailing list because we have had more than enough flame
 wars over GCC 2.96. Please let the matter rest.
 </para>
@@ -80,22 +80,22 @@
 (unofficial, but working fine)
 and you can install them along the gcc-2.96 you already have. MPlayer will
 detect it and use 3.2 instead of 2.96. If you do not want to or cannot use
-the binary packages, here is how you can compile GCC 3.x from source:
+the binary packages, here is how you can compile GCC 3 from source:
 </para>
 
 <procedure>
 <step><para>
   Go to the
-  <ulink url="http://gcc.gnu.org/mirrors.html">GCC mirrors</ulink>
-  page and download <filename>gcc-core-XXX.tar.gz</filename> where XXX is
-  the version number.  This includes the complete C compiler and is sufficient for
-  <application>MPlayer</application>. If you also want C++, Java or some of
-  the other advanced GCC features <filename>gcc-XXX.tar.gz</filename> may
-  better suit your needs.
+  <ulink url="http://gcc.gnu.org/mirrors.html">GCC mirrors page</ulink>
+  page and download <filename>gcc-core-<replaceable>XXX</replaceable>.tar.gz</filename>
+  where <replaceable>XXX</replaceable> is the version number. This includes the complete
+  C compiler and is sufficient for <application>MPlayer</application>. If you also want
+  C++, Java or some of the other advanced GCC features
+  <filename>gcc-<replaceable>XXX</replaceable>.tar.gz</filename> may better suit your needs.
   </para></step>
 <step><para>
   Extract the archive with
-  <screen>tar -xvzf gcc-core-XXX.tar.gz</screen>
+  <screen>tar -xvzf gcc-core-<replaceable>XXX</replaceable>.tar.gz</screen>
   </para></step>
 <step><para>
   GCC is not built inside the source directory itself like most programs,
@@ -108,7 +108,7 @@
   need the configure from the source directory:
   <screen>
 cd gcc-build
-../gcc-3.XXX/configure</screen>
+../gcc-3.<replaceable>XXX</replaceable>/configure</screen>
   </para></step>
 <step><para>
   Compile GCC by issuing this command in the build directory:
@@ -136,10 +136,10 @@
 
 <para>
 Another impediment to binary redistribution was compiletime optimizations
-for CPU architecture.  <application>MPlayer</application> now supports
+for CPU architecture. <application>MPlayer</application> now supports
 runtime CPU detection (specify the
 <option>--enable-runtime-cpudetection</option> option when compiling). It
-is disabled by default because it implies a small speed sacrifice, but it is
+is disabled by default because it implies a small speed sacrifice, it is
 now possible to create binaries that run on different members of the Intel
 CPU family.
 </para>
@@ -187,15 +187,15 @@
 He went on to mention <application>MPlayer</application> negatively in his
 <ulink url="http://www.linuxworld.com/site-stories/2001/1227.predictions.html">10 Linux predictions for 2002</ulink>.
 In a followup
-<ulink url="http://www.linuxworld.com/site-stories/2002/0125.xine.html">review of xine</ulink>
+<ulink url="http://www.linuxworld.com/site-stories/2002/0125.xine.html">review of Xine</ulink>
 he continued stirring up controversy. Ironically at the end of that article
-he quotes his exchange with Günter Bartsch, the original author of xine,
+he quotes his exchange with Günter Bartsch, the original author of <application>Xine</application>,
 that perfectly summarizes the whole situation:
 
 <blockquote><para>
 However, he also went on to say that he was "surprised" by my column about
-Mplayer and thought it was unfair, reminding me that it is a free software
-project. "If you don't like it," Bartsch said, "you're free not to use it." 
+<application>MPlayer</application> and thought it was unfair, reminding me that it is
+a free software project. "If you don't like it," Bartsch said, "you're free not to use it."
 </para></blockquote>
 </para>
 
@@ -208,7 +208,7 @@
 <para>
 Marc Rassbach has
 <ulink url="http://daily.daemonnews.org/view_story.php3?story_id=2102">something to say</ulink>
-about the man
+about the man.
 
 <blockquote><para>
 You may all remember the LinuxWorld 2000, when he claimed that Linus T said
diff -r 0768c63a7bd3 -r a570a78537aa DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Fri May 16 13:23:03 2003 +0000
+++ b/DOCS/xml/en/video.xml	Fri May 16 13:30:51 2003 +0000
@@ -164,7 +164,7 @@
 didn't support either YUY2 or YV12, and so. Verify that you have XFree86
 version 4.2.0 or greater, it works OK with YV12 and YUY2. Previous
 versions, including 4.1.0, <emphasis role="bold">crashes with YV12</emphasis>.
-If you experience strange effects using -vo xv, try SDL (it has XVideo too) and
+If you experience strange effects using <option>-vo xv</option>, try SDL (it has XVideo too) and
 see if it helps. Check the <link linkend="sdl">SDL section</link> for details.
 </para>
 
@@ -384,9 +384,9 @@
 <caution>
 <title>Security risk</title>
 <para>
-This is a <emphasis role="bold">big</emphasis> security risk! Never do this
-on a server or on a computer can be accessed by other people because they
-can gain root privileges through SUID root
+This is a <emphasis role="bold">big</emphasis> security risk!
+<emphasis role="bold">Never</emphasis> do this on a server or on a computer can be
+accessed by other people because they can gain root privileges through SUID root
 <application>MPlayer</application>.
 </para>
 </caution>
@@ -586,7 +586,7 @@
 <title>SDL</title>
 
 <para>
-SDL (Simple Directmedia Layer) is basically a unified
+<acronym>SDL</acronym> (Simple Directmedia Layer) is basically a unified
 video/audio interface. Programs that use it know only about SDL, and not
 about what video or audio driver does SDL actually use.  For example a Doom
 port using SDL can run on svgalib, aalib, X, fbdev, and others, you only
@@ -757,7 +757,7 @@
 
 <para>
 Whether to build the FBdev target is autodetected during
-<filename>./configure</filename>.  Read the framebuffer documentation in
+<filename>./configure</filename>. Read the framebuffer documentation in
 the kernel sources (<filename>Documentation/fb/*</filename>) for more
 information.
 </para>
@@ -970,7 +970,7 @@
 AAlib is a library for displaying graphics in text mode, using powerful
 ASCII renderer. There are <emphasis>lots</emphasis> of programs already
 supporting it, like Doom, Quake, etc. <application>MPlayer</application>
-contains a very usable driver for it.  If <filename>./configure</filename>
+contains a very usable driver for it. If <filename>./configure</filename>
 detects aalib installed, the aalib libvo driver will be built.
 </para>
 
@@ -1071,7 +1071,7 @@
 (using aalib on X), and it's least CPU intensive on standard,
 non-framebuffer console. Use SVGATextMode to set up a big textmode,
 then enjoy! (secondary head Hercules cards rock :)) (but imho you
-can use -vf 1bpp option to get graphics on hgafb:)
+can use <option>-vf 1bpp</option> option to get graphics on hgafb:)
 </para>
 </note>
 
@@ -1154,6 +1154,13 @@
   <emphasis role="bold">and</emphasis> TV output at the same time!
   (Recommended for ATI cards.)
   </simpara></listitem>
+<listitem><simpara>
+  If you have VESA VBE 3.0+, and you had specified
+  <systemitem>monitor_hfreq, monitor_vfreq, monitor_dotclock</systemitem> somewhere
+  (config file, or commandline) you will get the highest possible refresh rate.
+  (Using General Timing Formula). To enable this feature you have to specify
+  <emphasis role="bold">all</emphasis> your monitor options.
+  </simpara></listitem>
 </itemizedlist>
 
 <itemizedlist spacing="compact">
@@ -1183,8 +1190,9 @@
   <listitem><simpara>
     currently recognized: <literal>dga</literal> to force dga mode and
     <literal>nodga</literal> to disable dga mode. In dga mode you can enable
-    double buffering via the -double option. Note: you may omit these parameters
-    to enable <emphasis role="bold">autodetection</emphasis> of dga mode.
+    double buffering via the <option>-double</option> option. Note: you may omit
+    these parameters to enable <emphasis role="bold">autodetection</emphasis> of
+    dga mode.
     </simpara></listitem>
 </varlistentry>
 </variablelist>
@@ -1209,9 +1217,9 @@
   be activated anyway and you will need restart your computer.
   </simpara></listitem>
 <listitem><simpara>
-  Often after terminating VESA driver you get black screen. To return your
-  screen to original state - simply switch to other console (by pressing
-  <keycap>Alt</keycap>+<keycap>F&lt;x&gt;</keycap>)
+  Often after terminating VESA driver you get <emphasis role="bold">black</emphasis>
+  screen. To return your screen to original state - simply switch to other console
+  (by pressing <keycap>Alt</keycap>+<keycap>F&lt;x&gt;</keycap>)
   then switch to your previous console by the same way.
   </simpara></listitem>
 <listitem><simpara>
@@ -1277,7 +1285,7 @@
 <formalpara>
 <title>PREAMBLE</title>
 <para>
-VIDIX is the abbreviation for <emphasis role="bold">VID</emphasis>eo
+<acronym>VIDIX</acronym> is the abbreviation for <emphasis role="bold">VID</emphasis>eo
 <emphasis role="bold">I</emphasis>nterface for *ni<emphasis role="bold">X</emphasis>.
 VIDIX was designed and introduced as an interface for fast user-space drivers
 providing such video performance as mga_vid does for Matrox cards. It's also very
@@ -1339,9 +1347,9 @@
 <formalpara>
 <title>USAGE METHODS</title>
 <para>
-When VIDIX is used as <emphasis>subdevice</emphasis> (<option>-vo
+When VIDIX is used as <emphasis role="bold">subdevice</emphasis> (<option>-vo
 vesa:vidix</option>) then video mode configuration is performed by video
-output device (<emphasis>vo_server</emphasis> in short). Therefore you can
+output device (<emphasis role="bold">vo_server</emphasis> in short). Therefore you can
 pass into command line of <application>MPlayer</application> the same keys
 as for vo_server. In addition it understands <option>-double</option> key
 as globally visible parameter. (I recommend using this key with VIDIX at
@@ -1376,7 +1384,7 @@
 <para>
 Since VIDIX requires direct hardware access you can either run it as root
 or set the SUID bit on the <application>MPlayer</application> binary
-(<emphasis role="bold">Warning: This is a security risk!</emphasis>
+(<emphasis role="bold">Warning: This is a security risk!</emphasis>).
 Alternatively, you can use a special kernel module, like this:
 </para>
 
@@ -1390,6 +1398,7 @@
   </para></step>
 <step><para>
   Compile the module in the <filename class="directory">svgalib_helper</filename>
+  directory (it can be found inside the <filename class="directory">svgalib-1.9.17/kernel/</filename>
   directory if you've downloaded the source from the svgalib site) and insmod it.
   </para></step>
 <step><para>
@@ -1443,8 +1452,8 @@
 The driver was written and is maintained by Alastair M. Robinson, who
 offers the very latest driver versions for download from his
 <ulink url="http://www.blackfiveservices.co.uk/EPIAVidix.shtml">homepage</ulink>.
-The drivers are added to MPlayer with only a short delay, so CVS should always
-be up to date.
+The drivers are added to <application>MPlayer</application> with only a short
+delay, so CVS should always be up to date.
 </para>
 </sect5>
 
@@ -1468,9 +1477,10 @@
 <para>I'll exclude DirectFB features from this section.</para>
 
 <para>
-Though MPlayer is not supported as a &quot;video provider&quot; in DirectFB, this
-output driver will enable video playback through DirectFB. It will - of course -
-be accelerated, on my Matrox G400 DirectFB's speed was the same as XVideo.
+Though <application>MPlayer</application> is not supported as a &quot;video
+provider&quot; in DirectFB, this output driver will enable video playback through
+DirectFB. It will - of course - be accelerated, on my Matrox G400 DirectFB's speed
+was the same as XVideo.
 </para>
 
 <para>
@@ -1527,7 +1537,7 @@
 
 <para>If you have ost headers at a non-standard path, set the path with</para>
 
-<para><screen>./configure --with-extraincdir=&lt;DVB source directory&gt;/ost/include
+<para><screen>./configure --with-extraincdir=<replaceable>DVB source directory</replaceable>/ost/include
 </screen></para>
 
 <para>Then compile and install as usual.</para>
@@ -1601,7 +1611,7 @@
 </para>
 
 <para><screen>
-for  3:4 TV: -vf dvbscale,scale=-1:0,expand=-1:576:-1:-1:1
+for  4:3 TV: -vf dvbscale,scale=-1:0,expand=-1:576:-1:-1:1
 for 16:9 TV: -vf dvbscale=1024,scale=-1:0,expand=-1:576:-1:-1:1
 </screen></para>
 
@@ -1674,15 +1684,15 @@
 First of all you will need properly installed DXR3/H+ drivers, version 0.12.0
 or later. You can find the drivers and installation instructions at the
 <ulink url="http://dxr3.sourceforge.net/">DXR3 &amp; Hollywood Plus for Linux</ulink>
-site. Configure should detect your card automatically, compilation should go
-without problems.
+site. <filename>configure</filename> should detect your card automatically,
+compilation should go without problems.
 </para>
 
 <!-- FIXME: find a more clear presentation -->
 <variablelist>
 <title>USAGE</title>
 <varlistentry>
-<term><option>-vo dxr3:prebuf:sync:norm=x:&lt;device&gt;</option></term>
+<term><option>-vo dxr3:prebuf:sync:norm=x:<replaceable>device</replaceable></option></term>
 <listitem><para>
 <option>overlay</option> activates the overlay instead of TVOut. It requires
 that you have a properly configured overlay setup to work right. The easiest
@@ -1690,7 +1700,7 @@
 dxr3 output and without overlay turned on, run dxr3view. In dxr3view you can
 tweak the overlay settings and see the effects in realtime, perhaps this feature
 will be supported by the MPlayer GUI in the future. When overlay is properly set
-up you will no longer need to use dxr3view.&#x0d;
+up you will no longer need to use dxr3view.
 <option>prebuf</option> turns on prebuffering. Prebuffering is a feature of the
 em8300 chip that enables it to hold more than one frame of video at a time. This
 means that when you are running with prebuffering MPlayer will try to keep the
@@ -1713,7 +1723,7 @@
 3 = PAL. Special norms are 2 (auto-adjust using PAL/PAL-60) and 1 (auto-adjust
 using PAL/NTSC) because they decide which norm to use by looking at the frame
 rate of the movie. norm = 0 (default) does not change the current norm.
-<option>&lt;device&gt;</option> = device number to use if you have more than one em8300
+<option><replaceable>device</replaceable></option> = device number to use if you have more than one em8300
 card.
 Any of these options may be left out.
 <option>:prebuf:sync</option> seems to work great when playing DivX movies. People
@@ -1751,7 +1761,7 @@
 info about <option>-vf lavc/fame</option>.
 Using lavc is highly recommended. Currently there is no way of setting the fps
 of the em8300 which means that it is fixed to 29.97fps. Because of this it is
-highly recommended that you use <option>-vf lavc=&lt;quality&gt;:25</option>
+highly recommended that you use <option>-vf lavc=<replaceable>quality</replaceable>:25</option>
 especially if you are using prebuffering. Then why 25 and not 29.97? Well, the
 thing is that when you use 29.97 the picture becomes a bit jumpy. The reason for
 this is unknown to us. If you set it to somewhere between 25 and 27 the picture
@@ -1838,7 +1848,7 @@
 </para>
 
 <para>
-if you want to use the <systemitem>crop</systemitem> filter, you would do
+if you want to use the <option>crop</option> filter, you would do
 <screen>mplayer -vo zr -vf crop=720:320:80:0 benhur.avi</screen>
 </para>
 
@@ -1866,7 +1876,7 @@
 </para>
 
 <para>
-inally an important remark: Do not start or stop XawTV on the playback device
+Finally an important remark: Do not start or stop XawTV on the playback device
 during playback, it will crash your computer. It is, however, fine to
 <emphasis role="bold">FIRST</emphasis> start XawTV, <emphasis role="bold">THEN</emphasis>
 start MPlayer, wait for MPlayer to finish and <emphasis role="bold">THEN</emphasis>
@@ -1917,8 +1927,7 @@
     -zoom</option> options, but it will be <emphasis role="bold">SLOW</emphasis>,
     and has <emphasis role="bold">Macrovision</emphasis> copy protection enabled
     (you can "workaround" Macrovision using this
-    <ulink url="http://avifile.sourceforge.net/mgamacro.pl">perl
-    script</ulink>.
+    <ulink url="http://avifile.sourceforge.net/mgamacro.pl">perl script</ulink>).
     </para></listitem>
 </varlistentry>
 <varlistentry>
@@ -1953,8 +1962,7 @@
       Next, EDIT and run the <filename>./matroxtv</filename> script. This will
       present you to a very simple menu. Press <keycap>2</keycap> and
       <keycap>Enter</keycap>. Now you should have the same picture on your
-      monitor, and TV. The 3rd option will turn on independent display, but
-      then you <emphasis>can't use X!</emphasis> If the TV (PAL by default)
+      monitor, and TV. If the TV (PAL by default)
       picture has some weird stripes on it, the script wasn't able to set the
       resolution correctly (to 640x512 by default). Try other resolutions
       from the menu and/or experiment with fbset.
@@ -2107,7 +2115,7 @@
 </sect4>
 
 <sect4 id="tvout-nvidia">
-<title>Voodoo 3</title>
+<title>nVidia</title>
 <para>
 First, you MUST download the closed-source drivers from <ulink url="http://nvidia.com"/>.
 I will not describe the installation and configuration process because it does not cover