uniform VOBsub spelling

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

5 files changed, 19 insertions, 18 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 34263e873e..13dc646fa4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -163,7 +163,7 @@ antialiased shaded subtitles and visual feedback for keyboard controls.
 European/\:ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic and Korean
 fonts are supported along with 11 subtitle formats (MicroDVD, SubRip,
 SubViewer, Sami, VPlayer, RT, SSA, AQTitle, JACOsub, PJS and our own: MPsub) and
-DVD subtitles (SPU streams, VobSub and Closed Captions).
+DVD subtitles (SPU streams, VOBsub and Closed Captions).
 .PP
 .B mencoder
 (MPlayer's Movie Encoder) is a simple movie encoder, designed to encode
@@ -228,7 +228,8 @@ mute sound
 toggle fullscreen
 .IPs T\ \ \ \ 
 toggle stay-on-top.
-Supported by drivers which use X11, except SDL, as well as directx and gl2 under Windows.
+Supported by video out drivers which use X11, except SDL, as well as directx
+and gl2 under Windows.
 .IPs "w and e"
 decrease/\:increase panscan range
 .IPs o\ \ \ \ 
@@ -1215,8 +1216,8 @@ Display only forced subtitles for the DVD subtitle stream selected by e.g.\&
 Specifies the charset that will be passed to FriBiDi when decoding a non-UTF8
 subtitles (default: ISO8859-8).
 .TP
-.B \-ifo <vobsub\ ifo\ file>
-Indicate the file that will be used to load palette and frame size for VOBSUB
+.B \-ifo <VOBsub\ ifo\ file>
+Indicate the file that will be used to load palette and frame size for VOBsub
 subtitles.
 .TP
 .B \-noautosub
@@ -1269,7 +1270,7 @@ Selects Hungarian and falls back to English if Hungarian is not available.
 .
 .TP
 .B \-spuaa <mode> (OSD only)
-Antialiasing/scaling mode for DVD/VobSub.
+Antialiasing/scaling mode for DVD/VOBsub.
 A value of 16 may be added to mode in order to force scaling even
 when original and scaled frame size already match, for example to
 smooth subtitles with the gaussian blur.
@@ -1291,7 +1292,7 @@ uses swscaler gaussian blur (looks very good)
 .
 .TP
 .B \-spualign <-1\-2> (OSD only)
-Specify how spu (DVD/VobSub) subtitles should be aligned.
+Specify how spu (DVD/VOBsub) subtitles should be aligned.
 Values are the same as for \-subalign, with the extra choice -1 for original
 position.
 .TP
@@ -1453,13 +1454,13 @@ Tells MPlayer to handle the subtitle file as UNICODE.
 .B \-utf8 \ \ 
 Tells MPlayer to handle the subtitle file as UTF8.
 .TP
-.B \-vobsub <vobsub\ file\ without\ extension>
-Specify the VobSub files that are to be used for subtitle.
+.B \-vobsub <VOBsub\ file\ without\ extension>
+Specify the VOBsub files that are to be used for subtitle.
 This is the full pathname without extensions, i.e.\& without
 the '.idx', '.ifo' or '.sub'.
 .TP
 .B \-vobsubid <0\-31>
-Specify the VobSub subtitle id.
+Specify the VOBsub subtitle id.
 .
 .
 .SH "AUDIO OUTPUT OPTIONS (MPLAYER ONLY)"
@@ -4217,7 +4218,7 @@ Maximum skippable frames after non-skipped one
 .B \-vobsubout <basename>
 Specify the basename for the output .idx and .sub files.
 This turns off subtitle rendering in the encoded movie and diverts it to
-Vobsub subtitle files.
+VOBsub subtitle files.
 .TP
 .B \-vobsuboutid <langid>
 Specify the language two letter code for the subtitles.
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index f4e0e99375..8545ae18b5 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -150,7 +150,7 @@ audio. Also has powerful plugin system for video manipulation.
   into the output file
   </simpara></listitem>
 <listitem><simpara>
-  Can rip DVD subtitles to Vobsub format
+  Can rip DVD subtitles to VOBsub format
   </simpara></listitem>
 </itemizedlist>
 
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index f2a2a1440d..9b89006ec8 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -556,7 +556,7 @@ directory.
 <application>MPlayer</application> can display subtitles along with movie files.
 Currently the following formats are supported:
 <itemizedlist>
-<listitem><para>VobSub</para></listitem>
+<listitem><para>VOBsub</para></listitem>
 <listitem><para>OGM</para></listitem>
 <listitem><para>CC (closed caption)</para></listitem>
 <listitem><para>MicroDVD</para></listitem>
@@ -588,7 +588,7 @@ destination formats, with the given options:
 
 <para>
 <application>MEncoder</application> can dump DVD subtitles into
-<link linkend="menc-feat-extractsub">VobSub</link> format.
+<link linkend="menc-feat-extractsub">VOBsub</link> format.
 </para>
 
 <para>
@@ -596,9 +596,9 @@ The command line options differ slightly for the different formats:
 </para>
 
 <formalpara>
-<title>VobSub subtitles</title>
+<title>VOBsub subtitles</title>
 <para>
-VobSub subtitles consist of a big (some megabytes) <filename>.SUB</filename> file,
+VOBsub subtitles consist of a big (some megabytes) <filename>.SUB</filename> file,
 and optional <filename>.IDX</filename> and/or <filename>.IFO</filename>
 files.  If you have files like
 <filename><replaceable>sample.sub</replaceable></filename>,
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index fe8a82e2b2..2deaf169dc 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -356,11 +356,11 @@ mencoder mf://*.tga -mf w=800:h=600:fps=25:type=tga -ovc copy -oac copy -o <repl
 
 
 <sect1 id="menc-feat-extractsub">
-<title>Extracting DVD subtitles to Vobsub file</title>
+<title>Extracting DVD subtitles to VOBsub file</title>
 
 <para>
 <application>MEncoder</application> is capable of extracting subtitles from
-a DVD into Vobsub formatted files. They consist of a pair of files ending in
+a DVD into VOBsub formatted files. They consist of a pair of files ending in
 <filename>.idx</filename> and <filename>.sub</filename> and are usually
 packaged in a single <filename>.rar</filename> archive.
 <application>MPlayer</application> can play these with the
diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml
index 92a65b186a..ac12b4991b 100644
--- a/DOCS/xml/en/usage.xml
+++ b/DOCS/xml/en/usage.xml
@@ -289,7 +289,7 @@ You can have a full list of known commands by running
   </para></listitem>
 <listitem><para><literal>vobsub_lang</literal></para>
   <para>
-  Change the language of VobSub subtitles.
+  Change the language of VOBsub subtitles.
   </para></listitem>
 <listitem><para><literal>vo_fullscreen</literal></para>
   <para>