sync

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9684 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 46 insertions, 39 deletions

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 1236fb6fca..4fe5f6497a 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -78,7 +78,7 @@ and help us add support for it.
 <title>DivX4/DivX5</title>
 
 <para>
-This section contains information about the DivX4 codec of
+This section contains information about the DivX4 and DivX5 codecs of
 <ulink url="http://www.projectmayo.com">Project Mayo</ulink>.
 Their first available alpha version was OpenDivX 4.0 alpha 47 and 48.
 Support for this was included in <application>MPlayer</application> in the
@@ -277,10 +277,14 @@ for decoding. Follow the instructions to enable them:
 <step><para>
   Download the codecs you wish to use from the
   <ulink url="http://xanim.va.pubnix.com">XAnim site</ulink>.
-  The 3ivx codec is not there, but at the
+  The <emphasis role="bold">3ivx</emphasis> codec is not there, but at the
   <ulink url="http://www.3ivx.com">3ivx site</ulink>.
   </para></step>
 <step><para>
+  <emphasis role="bold">OR</emphasis> download the codecs pack from our
+  <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/">codecs page</ulink>
+  </para></step>
+<step><para>
   Use the <option>--with-xanimlibdir</option> option to tell
   <filename>configure</filename> where
   to find the XAnim codecs. By default, it looks for them at
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index 46a1bc5ce3..134ed4a8c7 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -29,7 +29,7 @@
 <bookinfo id="toc">
 <title>MPlayer - The Movie Player for LINUX</title>
 <subtitle><ulink url="http://www.mplayerhq.hu"></ulink></subtitle>
-<date>July 4, 2002</date>
+<date>March 24, 2003</date>
 <copyright>
   <year>2000</year>
   <year>2001</year>
@@ -74,16 +74,18 @@ The main rule of this documentation: if it's not documented, it
 <emphasis>does not exist.</emphasis> If I don't say you encode audio from
 TV tuner, you can't.  A healthy quantity of combining ability is welcomed,
 though.  Good luck. You'll need it :) And for another good advice, let me
-quote Chris Phillips from the mplayer-users mailing list:
+quote Chris Phillips from the
+<ulink url="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</ulink>
+mailing list:
 </para>
 
 <blockquote><para>
 I said a while ago that there is such a difference between a newbie and a
 dumbass. No matter what you actually know about a system (linux, cars,
 girls :D) you should ALWAYS be able to take a step back and be objective,
-otherwise, you're just dumb IMHO. A girl i live with assumed the vacuum
+otherwise, you're just dumb IMHO. A girl I live with assumed the vacuum
 cleaner was broken because it didn't suck things up. never thought to
-change the bag, becasue she'd never done it before... now that's just
+change the bag, because she'd never done it before... now that's just
 stupid, not a case of simply not knowing what to do... Simply not being
 that familiar with your surroundings is no excuse for a) laziness and b)
 ignorance. So many people seem to see the word "error" and then stop...
@@ -110,11 +112,11 @@ drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and
 Radeon, Mach64, Permedia3) too! Most of them supports software or hardware
 scaling, so you can enjoy movies in fullscreen.
 <application>MPlayer</application> supports displaying through some
-hardware MPEG decoder boards, such as the DVB and DXR3/Hollywood+ !  And
-what about the nice big antialiased shaded subtitles
-(<emphasis role="bold">10 supported types</emphasis>) with European/ISO 8859-1,2
-(Hungarian, English, Czech, etc), Cyrillic, Korean fonts, and the onscreen display
-(OSD)?
+hardware MPEG decoder boards, such as the <link linkend="dvb">DVB</link> and
+<link linkend="dxr3">DXR3/Hollywood+</link>. And what about the nice big
+antialiased shaded subtitles (<emphasis role="bold">10 supported types</emphasis>)
+with European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic, Korean
+fonts, and the onscreen display (OSD)?
 </para>
 
 <para>
@@ -132,8 +134,9 @@ but the speed is also amazing.
 encoder, designed to encode MPlayer-playable movies
 (<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>)
 to other MPlayer-playable formats (see below). It can encode with various codecs,
-like DivX4 (1 or 2 passes), libavcodec, <emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
-audio. Also has powerful plugin system for video manipulation.
+like <emphasis role="bold">DivX4</emphasis> (1 or 2 passes), libavcodec,
+<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> audio. Also has powerful plugin
+system for video manipulation.
 </para>
 
 
diff --git a/DOCS/xml/en/formats.xml b/DOCS/xml/en/formats.xml
index eae96d42b6..16daa19f7c 100644
--- a/DOCS/xml/en/formats.xml
+++ b/DOCS/xml/en/formats.xml
@@ -55,8 +55,8 @@ MPEG files come in different guises:
   VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
   It is the same as MPG, plus the capability to contain subtitles or non-MPEG
   (AC3) audio. It contains encoded MPEG2 video and usually AC3 audio, but DTS,
-  MP2 and uncompressed LPCM are allowed, too.  Read the
-  <link linkend="dvd">DVD section</link>!
+  MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the
+  <link linkend="dvd">DVD section</link></emphasis>!
   </simpara></listitem>
 </itemizedlist>
 
@@ -86,9 +86,9 @@ Designed by Microsoft, <emphasis role="bold">AVI (Audio Video Interleaved)</emph
 is a widespread multipurpose format currently used mostly for DivX and DivX4
 video. It has many known drawbacks and shortcomings (for example in streaming). It
 supports one video stream and 0 to 99 audio streams and can be as big as
-2GB. There exists an extension allowing bigger files called OpenDML. Microsoft
-currently strongly discourages its use and encourages ASF/WMV. Not that
-anybody cares.
+2GB, but there exists an extension allowing bigger files called
+<emphasis role="bold">OpenDML</emphasis>. Microsoft currently strongly
+discourages its use and encourages ASF/WMV. Not that anybody cares.
 </para>
 
 <para>
@@ -184,7 +184,7 @@ They usually have a <filename>.QT</filename> or <filename>.MOV</filename>
 extension. Note that since the MPEG4 group chose QuickTime as the recommended
 file format for MPEG4, their MOV files come with a <filename>.MPG</filename> or
 <filename>.MP4</filename> extension (Interestingly the video and audio
-streams in these files are real MPG and AAC files. Yo can even extract them with the
+streams in these files are real MPG and AAC files. You can even extract them with the
 <option>-dumpvideo</option> and <option>-dumpaudio</option> options.).
 </para>
 
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index dbbfa981ea..4de5ee23db 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -253,7 +253,7 @@ zooming), thus fullscreen is nice and very fast.
   otherwise no mga_vid support will be built. Also check out the
   <link linkend="tvout-mga-g400">Matrox TV-out</link> section.  If you
   <emphasis role="bold"> If you don't use Linux</emphasis>, your only
-  possibility is the VIDIX driver: read <link linkend="vidix">VIDIX</link> section.
+  possibility is the VIDIX driver: read the <link linkend="vidix">VIDIX</link> section.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">3Dfx Voodoo3/Banshee cards</emphasis>: please see
@@ -279,10 +279,10 @@ zooming), thus fullscreen is nice and very fast.
   support.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">nVidia cards</emphasis>: very bad choice for video playing.
+  <emphasis role="bold">nVidia cards</emphasis>: may or may not be good choice for video playing.
   If you do not have a GeForce2 (or newer) card, it's not likely to work without bugs.
-  <emphasis role="bold">the built-in nVidia driver in XFree86 doesn't contain
-  support for hardware YUV acceleration for all nVidia cards.</emphasis> You have
+  <emphasis role="bold">the built-in nVidia driver in XFree86 does not support
+  hardware YUV acceleration on all nVidia cards.</emphasis> You have
   to download nVidia's closed-source drivers from nVidia.com. See the <link
   linkend="nvidia">nVidia Xv driver</link> section for details. Please also check
   the <link linkend="tvout-nvidia">nVidia TV-out section</link> if you wish to
@@ -302,10 +302,10 @@ zooming), thus fullscreen is nice and very fast.
     </simpara></listitem>
   <listitem><simpara>
     If it doesn't, then your card's video features aren't supported under
-    your operating system :( If it does hardware scaling under Windows, it
-    doesn't mean it will do the same under Linux or other OS, it depends on
-    the drivers. Most manufacturers don't make Linux drivers nor release chip
-    specs - so you're unlucky if using their cards.
+    your operating system :( If hardware scaling works under Windows, it
+    doesn't mean it will work under Linux or other operating system, it depends on
+    the drivers. Most manufacturers neither make Linux drivers nor release
+    specifications of their chips - so you are unlucky if using their cards.
     See <xref linkend="non-yuv-cards"/>.
     </simpara></listitem>
   </itemizedlist>
@@ -320,7 +320,7 @@ zooming), thus fullscreen is nice and very fast.
 
 <para>
 Fullscreen playing can be achieved by either enabling <emphasis role="bold">
-software scaling</emphasis> (use the <option>-zoom</option> or <option>-vop</option>,
+software scaling</emphasis> (use the <option>-zoom</option> or <option>-vf</option> option,
 but i warn you: this is slow), or switching to a smaller video mode, for example
 352x288. If you don't have YUV acceleration, this latter method is recommended.
 Video mode switching can be enabled by using the <option>-vm</option> option and
@@ -384,9 +384,9 @@ it works with the following drivers:
 <itemizedlist>
 <listitem><simpara>
   <emphasis role="bold">Soundblaster Live!</emphasis>: with this card you can use
-  4 or 6 (5.1) channels AC3 decoding instead of 2. Read the
+  4 or 6 (<emphasis role="bold">5.1</emphasis>) channels AC3 decoding instead of 2. Read the
   <link linkend="swac3">Software AC3 decoding</link> section. For hardware AC3
-  passthrough you <emphasis role="bold">must</emphasis> use ALSA 0.9 oss emulation!
+  passthrough you <emphasis role="bold">must</emphasis> use ALSA 0.9 with OSS emulation!
   </simpara></listitem>
 <listitem><simpara>
   <emphasis role="bold">C-Media with SP/DIF out</emphasis>: hardware AC3
@@ -709,7 +709,7 @@ There are many ways to get it:
   </thead>
   <tbody>
   <row><entry>
-    <ulink url="ftp://ftp.mplayerhq.hu/MPlayer/releases/"></ulink>
+    <ulink url="ftp://ftp.mplayerhq.hu/MPlayer/releases/fonts/"></ulink>
     </entry><entry>
     ISO fonts
     </entry></row>
@@ -719,7 +719,7 @@ There are many ways to get it:
     various fonts by users
     </entry></row>
   <row><entry>
-    <ulink url="http://realtime.ssu.ac.kr/~lethean/mplayer"></ulink>
+    <ulink url="http://realtime.ssu.ac.kr/~lethean/mplayer/"></ulink>
     </entry><entry>
     Korean fonts and RAW plugin
     </entry></row>
diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml
index e6d070d88d..b057658743 100644
--- a/DOCS/xml/en/tvinput.xml
+++ b/DOCS/xml/en/tvinput.xml
@@ -175,7 +175,7 @@ LAME codec. This setup is suitable for capturing movies.
      mencoder -tv on:driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \
      -oac mp3lame -lameopts cbr:br=64 \
-     -vf pp=lb,crop=720:544:24:16 -o output.avi
+     -vf crop=720:544:24:16,pp=lb -o output.avi
 </screen>
 </para>
 </informalexample>
@@ -191,7 +191,7 @@ capturing long TV series, where the video quality isn't so important.
      mencoder -tv on:driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=350:vhq:vqmax=31:keyint=300 \
      -oac mp3lame -lameopts cbr:br=48 \
-     -vf scale=384:288,pp=tn/lb,crop=720:540:24:18 -sws 1 -o output.avi 
+     -vf crop=720:540:24:18,pp=tn/lb,scale=384:288 -sws 1 -o output.avi
 </screen>
 It's also possible to specify smaller image dimensions in the <option>-tv</option>
 option and omit the software scaling but this approach uses the maximum available
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index 1bd419cf5b..d83f48198f 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -731,7 +731,7 @@ Maybe automatic aspect correction has to be shut off:
 </para>
 
 <note><para>
-according to my experience the best image quality on
+According to my experience the best image quality on
 EGA screens can be achieved by decreasing the brightness a bit:
 <option>-vf eq=-20:0</option>. I also needed to lower the audio
 samplerate on my box, because the sound was broken on 44kHz:
@@ -739,7 +739,7 @@ samplerate on my box, because the sound was broken on 44kHz:
 </para></note>
 
 <para>
-ou can turn on OSD and subtitles only with the <systemitem>expand</systemitem>
+You can turn on OSD and subtitles only with the <systemitem>expand</systemitem>
 filter, see the man page for exact parameters.
 </para>
 </sect4>
@@ -1482,7 +1482,7 @@ informations.
 </para>
 
 <para>This video output driver will enable CRTC2 (on the second head) on the
-Matrox G400/G450/G500 card, displaying video <emphasis role="bold">independently</emphasis>
+Matrox G400/G450/G550 card, displaying video <emphasis role="bold">independently</emphasis>
 of the first head.
 </para>
 
@@ -1594,8 +1594,8 @@ while keeping the right aspect ratio), use the new dvbscale filter:
 </para>
 
 <para><screen>
-for  3:4 TV: -vf expand=-1:576:-1:-1:1,scale=-1:0,dvbscale
-for 16:9 TV: -vf expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024
+for  3:4 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>
 
 <formalpara>