fixes, some by Dmitry Baryshkov <lumag@qnc.ru>, some by me

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

2 files changed, 15 insertions, 10 deletions

diff --git a/DOCS/xml/en/bugs.xml b/DOCS/xml/en/bugs.xml
index b2f03bff74..c5918cbfce 100644
--- a/DOCS/xml/en/bugs.xml
+++ b/DOCS/xml/en/bugs.xml
@@ -12,7 +12,7 @@
 </listitem>
 <listitem>
 <para>General SIGILL (signal 4):</para>
-<para>Problem: you compiled and run mplayer in different machines
+<para>Problem: you compiled and run MPlayer in different machines
 (for example compiled on P3 and running on Celeron)</para>
 <para>Solution: compile MPlayer on the same machine where you will use it!</para>
 <para>Workaround: <command>./configure --disable-sse</command> etc. options</para>
@@ -45,20 +45,20 @@ lame packages, they may have been compiled with gcc 2.96.</para>
 <listitem><para>
 most common: buggy audio driver! - try to use different drivers, try ALSA 0.9 OSS
 emulation with <option>-ao oss</option>, also try <option>-ao sdl</option>,
-sometimes it helps. If your file plays fine with -nosound, then you can be sure
+sometimes it helps. If your file plays fine with <option>-nosound</option>, then you can be sure
 it's sound card (driver) problem.
 </para></listitem>
 </itemizedlist>
 <itemizedlist>
 <listitem>
 <para>audio buffer problems (buffer size badly detected)</para>
-<para>Workaround: mplayer <option>-abs</option> option</para>
+<para>Workaround: MPlayer's <option>-abs</option> option</para>
 </listitem>
 </itemizedlist>
 <itemizedlist>
 <listitem><para>
 samplerate problems - maybe your card doesn't support the samplerate used in your
-files - try the resampling plugin (<option>-aop</option>)
+files - try the resampling plugin (<option>-af resample=...</option>)
 </para></listitem>
 </itemizedlist>
 <itemizedlist>
@@ -102,7 +102,7 @@ If none of these help, please upload the file, we'll check (and fix).
 <listitem>
 <para>your sound card doesn't support 48kHz playback</para>
 <para>Workaround: buy a better sound card... or try to decrease fps by 10% (use
-<option>-fps 27</option> for a 30fps movie) or use the resampler plugin</para>
+<option>-fps 27</option> for a 30fps movie) or use the resample plugin</para>
 </listitem>
 <listitem>
 <para>slow machine(if A-V is not around 0, and the last number in the status
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 4de5ee23db..d6084a8e55 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -43,7 +43,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">XFree86</emphasis> - suggested version is <emphasis role="bold">always the
-  newest</emphasis> (4.2.1).  Normally, everyone wants this, as starting
+  newest</emphasis> (4.3.0).  Normally, everyone wants this, as starting
   with XFree86 4.0.2, it contains the <link linkend="xv">XVideo</link>
   extension (somewhere referred to as <emphasis role="bold">Xv</emphasis>)
   which is needed to enable the hardware YUV acceleration (fast image display)
@@ -114,8 +114,8 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
   <emphasis role="bold">libavcodec</emphasis>: This codec package is capable
   of decoding H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video
   streams and WMA (Windows Media Audio) v1/v2 audio streams, on multiple
-  platforms. It is also known to be the fastest for this task. See the
-  <link linkend="ffmpeg">this section</link> section for details. Features:
+  platforms. It is also known to be the fastest for this task. See
+  <link linkend="ffmpeg">this section</link> for details. Features:
   <itemizedlist>
   <listitem><simpara>
     gain decoding of videos mentioned above, on non-x86 machines
@@ -166,7 +166,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">DivX4/DivX5</emphasis>: information about this codec is
-  available in the <link linkend="divx4-5">DivX4/DivX5</link>. You possibly
+  available in the <link linkend="divx4-5">DivX4/DivX5 section</link>. You possibly
   don't want this codec as <emphasis role="bold">libavcodec</emphasis> (see
   above) is much faster and has better quality than this, for both decoding
   and encoding. Features:
@@ -631,7 +631,7 @@ About DVD subtitles, read the <link linkend="dvd">DVD section</link>.
 
 
 <sect2 id="mpsub">
-<title>MPlayer's own subtitle format</title>
+<title>MPlayer's own subtitle format (MPsub)</title>
 
 <para>
 <application>MPlayer</application> introduces a new subtitle format called
@@ -768,6 +768,11 @@ it off with the <keycap>o</keycap> key).
 </para>
 
 <para>
+
+</para>
+(subtitles are <emphasis>always enabled</emphasis>, for disabling them please
+read the man page)
+<para>
 OSD has 4 states (switch with <keycap>o</keycap>):
 
 <orderedlist>