*** empty log message ***

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

3 files changed, 14 insertions, 17 deletions

diff --git a/DOCS/ChangeLog b/DOCS/ChangeLog
index ea1b8aa62f..abfaa659e7 100644
--- a/DOCS/ChangeLog
+++ b/DOCS/ChangeLog
@@ -12,13 +12,6 @@ Note: If you've sent patches not applied in pre22, please send them again!
 
 *** 0.11 release is coming SOON!!! ***
 
-v0.11-pre25:  small fixes again :(
-  - DOCS updated (email address changed from arpi@* -> maillist)
-  - LIRC fix, mplayer_lirc changed back to mplayer [Andreas Ackermann]
-  - stream.c: unsigned int fixes, required for some strange .asf files
-  - asfheader.c: using w=h=b=1 for audio_concealment_none
-  - VCD-related stuff moved from stream.c to vcd_read.c
-  - incremented version in version.h :)
 
 v0.11-pre24:  small fixes again :(
   - DOCS/LIRC changed: users *must* enable lirc support manually, it is
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index 40d3ae414d..59c7cd222a 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -30,7 +30,7 @@ A: copy DOCS/inttypes.h to MPlayer directory (cp DOCS/inttypes.h .)
    try again... if fail, contact me
 
 Q: I have Pentium III but ./configure doesn't detect SSE
-A: Only kernel versions 2.4.x supports SSE
+A: Only kernel versions 2.4.x supports SSE (or try latest 2.2.19 or newer)
 
 Q: fullscreen option (-fs) and/or -xy doesn't work with x11 driver (-vo x11)
 A: x11 driver doesn't support scaling, and it can't change screen resolution.
@@ -68,11 +68,11 @@ A: your opengl driver doesn't support dynamic texture chanegs (glTexSubImage)
    it's known to work with Utah-GLX and Matrox G400 card.
    it will not work with 3DFX cards because the 256x256 texture size limit.
 
-Q: I have g200/g400, how to compile/use mga_vid driver?
+Q: I have G200/G400, how to compile/use mga_vid driver?
 A: read INSTALL and README...
 
 Q: What's XMMP? (it's XMMS or XMPS but mispelled?)
-A: It's a new project, see www.frozenproductions.com for details
+A: It's a new project, see http://frozenproductions.com for details
 
 Q: There are error messages about file not found /usr/lib/win32/....
 A: Download & install w32codec.zip from *our* FTP
@@ -118,3 +118,10 @@ A: Inform the MPlayer-users mailing list about your problem. *ALWAYS*
    Use the developers addresses (specified in AUTHORS) only if you want to
    flame, or want to ask for a date. ;)
 
+Q: During 'make', MPlayer complains about X11 libraries. I don't understand,
+   I DO have X installed!?
+A: ...but you don't have the X development package installed. It's called
+   XFree86-devel* under RedHat, and xlib6g-dev* under Debian.
+   Also check if the /usr/X11 symlink exists (this can be a problem on
+   Mandrake systems). It can be created with the 'ln -sf /usr/X11R6 /usr/X11'
+   command. Your distribution may differ from the Linux Filesystem Standard.
diff --git a/DOCS/README b/DOCS/README
index cfc9671cd6..97c72efa10 100644
--- a/DOCS/README
+++ b/DOCS/README
@@ -76,13 +76,11 @@ Supported video codecs:
 Supported video output devices:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - mga:  Matrox G200/G400 hardware YUV overlay via the mga_vid device
-	(Some people reported that G200 is broken :(  if you are a programmer
-	and you have a G200, please check it and fix if you can!)
 - xmga: Matrox G200/G400 overlay (mga_vid) in X11 window
 	(Xv emulation on X 3.3.x !)
 - x11:  X11 optionally with SHM extension
 - xv:   X11 using overlays with the Xvideo extension (hardware YUV & scaling)
-- gl:   OpenGL renderer, requires Utah-GLX or DRI or nVidia's new driver
+- gl:   OpenGL renderer, probably won't work with nVidia's drivers (check FAQ!)
 - syncfb: Matrox G400 YUV support on framebuffer (not tested, maybe broken)
 - 3dfx: Voodoo2/3 hardware YUV (/dev/3dfx) support (not yet tested, maybe broken)
 - sdl:  SDL v1.1.7 driver (slower than 'x11', but supports software scaling)
@@ -197,7 +195,7 @@ Troubleshooting:
       - config.h and all of config.mak files
    Note: many users reported that SSE was not detected while running on P3.
    Current stable 2.2.x kernels does NOT support SSE, so you can't use it
-   without patches or using the 2.4.x series.
+   without patches or using the 2.4.x series. (or try latest 2.2.19 or newer)
 
 3. If you have a problem with the player, please run it with -v option, and
    send the output of it, with a detailed description of the problem.
@@ -244,9 +242,8 @@ Troubleshooting:
      there will be a listing of the installed codecs (vids.<codecname>=DLLfile)
    - a sample file encoded with that codec.
 
-
-Download:
-~~~~~~~~~
+Contact information:
+~~~~~~~~~~~~~~~~~~~~
 Download:  ftp://thot.banki.hu/esp-team/linux/MPlayer/
       or:  http://thot.banki.hu/esp-ftp/linux/MPlayer/
 Homepage:  http://thot.banki.hu/esp-team/MPlayer.html