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

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

2 files changed, 12 insertions, 11 deletions

diff --git a/DOCS/xml/en/cd-dvd.xml b/DOCS/xml/en/cd-dvd.xml
index eb7f6537b1..d06a5a7ced 100644
--- a/DOCS/xml/en/cd-dvd.xml
+++ b/DOCS/xml/en/cd-dvd.xml
@@ -29,15 +29,15 @@ Many CD-ROM drives are annoyingly loud, a lower speed may reduce the noise.
 <para>
 You can reduce the speed of IDE CD-ROM drives with <command>hdparm</command> or a
 program called <command>setcd</command>.  It works like this:
-<screen>hdparm -E [speed] [cdrom device]</screen>
-<screen>setcd -x [speed] [cdrom device]</screen>
+<screen>hdparm -E <replaceable>[speed]</replaceable> <replaceable>[cdrom device]</replaceable></screen>
+<screen>setcd -x <replaceable>[speed]</replaceable> <replaceable>[cdrom device]</replaceable></screen>
 </para>
 
 <para>
 You can also try
-<screen>echo current_speed:4 &gt; /proc/ide/[cdrom device]/settings</screen>
+<screen>echo current_speed:4 &gt; /proc/ide/<replaceable>[cdrom device]</replaceable>/settings</screen>
 but you will need root privileges. The following command may also help:
-<screen>echo file_readahead:2000000 &gt; /proc/ide/[cdrom device]/settings</screen>
+<screen>echo file_readahead:2000000 &gt; /proc/ide/<replaceable>[cdrom device]</replaceable>/settings</screen>
 </para>
 
 <para>
@@ -54,7 +54,7 @@ man page for a detailed explanation).
 </para>
 
 <para>
-Please refer to &quot;<filename>/proc/ide/[cdrom device]/settings&quot;</filename>
+Please refer to &quot;<filename>/proc/ide/<replaceable>cdrom device</replaceable>/settings&quot;</filename>
 for fine-tuning your CD-ROM.
 </para>
 
@@ -65,7 +65,7 @@ Tell us!) There is a tool that works for
 </para>
 
 <para>FreeBSD:</para>
-<para>Speed: <command>cdcontrol [-f device] speed [speed]</command></para>
+<para>Speed: <command>cdcontrol [-f <replaceable>device</replaceable>] speed <replaceable>speed</replaceable></command></para>
 <para>DMA: <command>sysctl hw.ata.atapi_dma=1</command></para>
 </sect1>
 
@@ -74,7 +74,7 @@ Tell us!) There is a tool that works for
 <para>
 For the complete list of available options, please read the man page.
 The Syntax for a standard Digital Versatile Disc (DVD) is as follows:
-<screen>mplayer -dvd &lt;track&gt; [-dvd-device &lt;device&gt;]</screen>
+<screen>mplayer -dvd <replaceable>&lt;track&gt;</replaceable> [-dvd-device <replaceable>&lt;device&gt;</replaceable>]</screen>
 </para>
 
 <para>
@@ -282,7 +282,7 @@ to set the region code of your DVD drive (under Linux).
 <para>
 For the complete list of available options, please read the man page. The Syntax for a
 standard Video CD (VCD) is as follows:
-<screen>mplayer -vcd &lt;track&gt; [-cdrom-device &lt;device&gt;]</screen>
+<screen>mplayer -vcd <replaceable>&lt;track&gt;</replaceable> -cdrom-device <replaceable>&lt;device&gt;</replaceable></screen>
 Example:
 <screen>mplayer -vcd 2 -cdrom-device /dev/hdc</screen>
 The default VCD device is <filename>/dev/cdrom</filename>. If your setup
@@ -342,7 +342,7 @@ tracks in this file. To play a .DAT file you need the kernel driver which can
 be found in the Linux version of PowerDVD. It has a modified iso9660 filesystem
 (<filename>vcdfs/isofs-2.4.X.o</filename>) driver, which is able to emulate the
 raw tracks through this shadow .DAT file. If you mount the disc using their
-driver, you can copy and even play .DAT files with mplayer. But it will not
+driver, you can copy and even play .DAT files with <application>MPlayer</application>. But it will not
 work with the standard iso9660 driver of the Linux kernel! Use the
 <option>-vcd</option> option instead. Alternatives for VCD copying are the
 new <ulink url="http://www.elis.rug.ac.be/~ronsse/cdfs/">cdfs</ulink> kernel
diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml
index b057658743..517e16fbec 100644
--- a/DOCS/xml/en/tvinput.xml
+++ b/DOCS/xml/en/tvinput.xml
@@ -4,7 +4,8 @@
 
 <para>
 This section is about how to enable <emphasis role="bold">watching/grabbing
-from V4L compatible TV tuner</emphasis>.
+from V4L compatible TV tuner</emphasis>. See the man page for a description
+of TV options and keyboard controls.
 </para>
 
 
@@ -20,7 +21,7 @@ from V4L compatible TV tuner</emphasis>.
   </para></step>
 <step><para>
   Make sure your tuner works with another TV software in Linux, for
-  example xawtv.
+  example <application>XawTV</application>.
   </para></step>
 </procedure>
 </sect2>