From f4852219f216b49280e0da09af0394ef7173ca20 Mon Sep 17 00:00:00 2001
From: gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 12 Jan 2003 21:24:19 +0000
Subject: [PATCH] fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8931 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/documentation.html | 10 ++++++----
 DOCS/encoding.html      |  4 ++--
 DOCS/faq.html           |  7 +++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index fec4f63a75..959918e092 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -260,7 +260,7 @@
     <UL>
       <LI><A HREF="faq.html#compilation">5.1 Compilation</A></LI>
       <LI><A HREF="faq.html#general">5.2 General questions</A></LI>
-      <LI><A HREF="faq.html#playback">5.3 playback problems</A></LI>
+      <LI><A HREF="faq.html#playback">5.3 Playback problems</A></LI>
       <LI><A HREF="faq.html#driver">5.4 Video/audio driver problems (vo/ao)</A></LI>
       <LI><A HREF="faq.html#dvd">5.5 DVD playback</A></LI>
       <LI><A HREF="faq.html#features">5.6 Feature requests</A></LI>
@@ -1735,15 +1735,17 @@ end
     accessed.
     (<A HREF="http://groups.yahoo.com/group/solarisonintel/message/22516">http://groups.yahoo.com/group/solarisonintel/message/22516</A>)
     <P>
-    This problem does not exist in the SPARC version of Solaris 8.
+      This problem does not exist in the SPARC version of Solaris 8.
+    </P>
   </LI>
   <LI>A similar bug is present in the hsfs(7FS) filesystem code (aka
     ISO9660), hsfs may not not support partitions/disks larger than 4GB, all data
     is accessed modulo 4GB.
     (<A HREF="http://groups.yahoo.com/group/solarisonintel/message/22592">http://groups.yahoo.com/group/solarisonintel/message/22592</A>).
     <P>
-    The hsfs problem can be fixed by installing patch 109764-04 (sparc) /
-    109765-04 (x86).
+      The hsfs problem can be fixed by installing patch 109764-04 (sparc) /
+      109765-04 (x86).
+    </P>
   </LI>
 </UL>
 
diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index b302df3644..0482305ff4 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -23,7 +23,7 @@
   encoding with MEncoder.</P>
 
 
-<H2><A NAME="2pass">7.1 Encoding 2 or 3-pass MPEG-4 ("DIVX")</A></H2>
+<H2><A NAME="2pass">7.1 Encoding 2 or 3-pass MPEG-4 ("DivX")</A></H2>
 
 <P><U><B>2-pass encoding:</B></U> the name comes from the fact that this method
   encodes the file <I>twice</I>. The first encoding (dubbed <I>pass</I>)
@@ -149,7 +149,7 @@
   <LI>mjpeg - Motion JPEG</LI>
   <LI>h263 - H263</LI>
   <LI>h263p - H263 Plus</LI>
-  <LI>mpeg4 - ISO standard MPEG-4 (DivX 4/5, OpenDivX, XVID compatible)</LI>
+  <LI>mpeg4 - ISO standard MPEG-4 (DivX 5, XVID compatible)</LI>
   <LI>msmpeg4 - pre-standard MPEG-4 variant by MS, v3 (aka DivX3)</LI>
   <LI>msmpeg4v2 - pre-standard MPEG-4 by MS, v2 (used in old asf files)</LI>
   <LI>wmv1 - Windows Media Video, version 1 (aka WMV7)</LI>
diff --git a/DOCS/faq.html b/DOCS/faq.html
index 1bfa70e1d1..adbf30ee2c 100644
--- a/DOCS/faq.html
+++ b/DOCS/faq.html
@@ -732,6 +732,13 @@
     <A HREF="documentation.html#cygwin">Cygwin</A>.</DD>
   <DD>&nbsp;</DD>
 
+  <DT>Q: How can I make MPlayer remember the options I use for this
+    particular file?</DT>
+  <DD>A: Create a file named <CODE>movie.avi.conf</CODE> with the
+    file-specific options in it and put it in <CODE>~/.mplayer</CODE> or in
+    the same directory as the file.</DD>
+  <DD>&nbsp;</DD>
+
 </DL>