2 files changed, 19 insertions, 80 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 544bce1e4e..30043fb11b 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -124,11 +124,6 @@ tivo://host/[list|llist|fsid]
 [options]
 .
 .br
-.B gmplayer
-[options]
-[\-skin\ skin]
-.
-.br
 .B mencoder
 [options] file
 [file|URL|\-] [\-o file | file://file | smb://[user:pass@]host/filepath]
@@ -362,30 +357,6 @@ Seek backward/\:forward 1 minute.
 .PD 1
 .PP
 .RS
-(The following keys are only valid if GUI support is compiled in
-and will take precedence over the keys defined above.)
-.RE
-.PP
-.PD 0
-.RS
-.IPs ENTER
-Start playing.
-.IPs "ESC\ \ "
-Stop playing.
-.IPs "l\ \ \ \ "
-Load file.
-.IPs "t\ \ \ \ "
-Load subtitle.
-.IPs "c\ \ \ \ "
-Open skin browser.
-.IPs "p\ \ \ \ "
-Open playlist.
-.IPs "r\ \ \ \ "
-Open preferences.
-.RE
-.PD 1
-.PP
-.RS
 (The following keys are only valid if you compiled with TV or DVB input
 support and will take precedence over the keys defined above.)
 .RE
@@ -720,8 +691,6 @@ Available options are:
 .RSs
 .IPs "all\ \ "
 all configuration files
-.IPs "gui (GUI only)"
-GUI configuration file
 .IPs system
 system configuration file
 .IPs "user\ "
@@ -757,7 +726,6 @@ Use the given profile(s), \-profile help displays a list of the defined profiles
 .TP
 .B \-really\-quiet (also see \-quiet)
 Display even less output and status messages than with \-quiet.
-Also suppresses the GUI error message boxes.
 .
 .TP
 .B \-show\-profile <profile>
@@ -865,15 +833,12 @@ later.
 See http://www.mplayerhq.hu/\:DOCS/\:HTML/\:en/\:edl.html for details.
 .
 .TP
-.B \-enqueue (GUI only)
-Enqueue files given on the command line in the playlist instead of playing them
-immediately.
-.
-.TP
-.B \-fixed\-vo
-Enforces a fixed video system for multiple files (one (un)initialization for
-all files).
+.B \-nofixed\-vo
+\-fixed\-vo enforces a fixed video system for multiple files (one
+(un)initialization for all files).
 Therefore only one window will be opened for all files.
+Now enabled by default, use \-nofixed\-vo to disable and create a new window
+whenever the video stream changes.
 Currently the following drivers are fixed-vo compliant: gl, gl2, mga, svga, x11,
 xmga, xv, xvidix and dfbmga.
 .
@@ -884,12 +849,6 @@ Video filters are not applied to such frames.
 For B-frames even decoding is skipped completely.
 .
 .TP
-.B \-(no)gui
-Enable or disable the GUI interface (default depends on binary name).
-Only works as the first argument on the command line.
-Does not work as a config-file option.
-.
-.TP
 .B \-h, \-help, \-\-help
 Show short summary of options.
 .
@@ -1074,6 +1033,11 @@ Turns off LIRC support.
 .B \-nomouseinput
 Disable mouse button press/\:release input (mozplayerxp's context menu relies
 on this option).
+.TP
+.B \-noorderedchapters
+Disable support for Matroska ordered chapters.
+MPlayer will not load or search for video segments from other files,
+and will also ignore any chapter order specified for the main file.
 .
 .TP
 .B \-rtc (RTC only)
@@ -1116,20 +1080,6 @@ Use the specified device for RTC timing.
 Play files in random order.
 .
 .TP
-.B \-skin <name> (GUI only)
-Loads a skin from the directory given as parameter below the default skin
-directories, /usr/\:local/\:share/\:mplayer/\:skins/\: and ~/.mplayer/\:skins/.
-.sp 1
-.I EXAMPLE:
-.PD 0
-.RSs
-.IPs "\-skin fittyfene"
-Tries /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
-and afterwards ~/.mplayer/\:skins/\:fittyfene.
-.RE
-.PD 1
-.
-.TP
 .B \-slave (also see \-input)
 Switches on slave mode, in which MPlayer works as a backend for other programs.
 Instead of intercepting keyboard events, MPlayer will read commands separated
@@ -2152,7 +2102,7 @@ The same, but hinting will only be performed if the OSD is rendered at
 screen resolution and will therefore not be scaled.
 .RE
 .RSs
-The default value is 7 (use native hinter for unscaled OSD and no hinting otherwise).
+The default value is 5 (use light hinter for unscaled OSD and no hinting otherwise).
 .RE
 .PD 1
 .
@@ -3064,6 +3014,13 @@ VESA framebuffer does not support mode changing.
 Override framebuffer mode configuration file (default: /etc/\:fb.modes).
 .
 .TP
+.B \-force\-window\-position
+Forcefully move MPlayer's video output window to default location whenever
+there is a change in video parameters, video stream or file.
+This used to be the default behavior.
+Currently only affects X11 VOs.
+.
+.TP
 .B \-fs (also see \-zoom)
 Fullscreen playback (centers movie, and paints black bands around it).
 Not supported by all video output drivers.
@@ -3151,12 +3108,6 @@ Places the window at the bottom right corner of the screen.
 .PD 1
 .
 .TP
-.B \-guiwid <window ID> (also see \-wid) (GUI only)
-This tells the GUI to also use an X11 window and stick itself to the bottom
-of the video, which is useful to embed a mini-GUI in a browser (with the
-MPlayer plugin for instance).
-.
-.TP
 .B \-hue <\-100\-100>
 Adjust the hue of the video signal (default: 0).
 You can get a colored negative of the image with this option.
@@ -3287,7 +3238,7 @@ the new display mode.
 Enables VBI for the vesa, dfbmga and svga video output drivers.
 .
 .TP
-.B \-wid <window ID> (also see \-guiwid) (X11, OpenGL and DirectX only)
+.B \-wid <window ID> (X11, OpenGL and DirectX only)
 This tells MPlayer to attach to an existing window.
 Useful to embed MPlayer in a browser (e.g.\& the plugger extension).
 This option fills the given window completely, thus aspect scaling,
@@ -4333,8 +4284,6 @@ Each file takes the frame number padded with leading zeros as name.
 .IPs z=<0\-9>
 Specifies the compression level.
 0 is no compression, 9 is maximum compression.
-.IPs outdir=<dirname>
-Specify the directory to save the PNG files to (default: ./).
 .IPs alpha (default: noalpha)
 Create PNG files with an alpha channel.
 Note that MPlayer in general does not support alpha, so this will only
@@ -11088,14 +11037,6 @@ MEncoder user settings
 input bindings (see '\-input keylist' for the full list)
 .
 .TP
-~/.mplayer/\:gui.conf
-GUI configuration file
-.
-.TP
-~/.mplayer/\:gui.pl
-GUI playlist
-.
-.TP
 ~/.mplayer/\:font/
 font directory (There must be a font.desc file and files with .RAW extension.)
 .
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 5b23beec9b..40c41aaf90 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -4570,8 +4570,6 @@ Ne gère que les formats RGB et BGR 24 bits/pixel.
 .IPs z=<0\-9>
 Définit le taux de compression.
 0 équivaut à pas de compression et 9 à la compression maximale.
-.IPs outdir=<chemin>
-Définit le répertoire où sauver les fichiers PNG (par défaut\ ./).
 .IPs alpha (par défaut\ : noalpha)
 Crée un fichier PNG avec un canal alpha.
 Notez que MPlayer ne gère en général pas les canaux alpha, donc cette