Merge svn changes up to r27347

Conflicts:

	libvo/x11_common.c
	libvo/x11_common.h

Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.

4 files changed, 39 insertions, 14 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index bd94ed3c93..8fe9601867 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -2888,7 +2888,6 @@ Only supported by the fbdev, dga, svga, vesa video output drivers.
 Play movie with window border and decorations.
 Since this is on by default, use \-noborder to disable the standard window
 decorations.
-Supported by the directx video output driver.
 .
 .TP
 .B \-brightness <\-100\-100>
@@ -3237,7 +3236,7 @@ This tells MPlayer to attach to an existing window.
 Useful to embed MPlayer in a browser (e.g.\& the plugger extension).
 .
 .TP
-.B \-xineramascreen <\-2\-...> (X11 only)
+.B \-xineramascreen <\-2\-...>
 In Xinerama configurations (i.e.\& a single desktop that spans across multiple
 displays) this option tells MPlayer which screen to display the movie on.
 A value of \-2 means fullscreen across the whole virtual display (in this case
@@ -3246,6 +3245,9 @@ fullscreen on the display the window currently is on.
 The initial position set via the \-geometry option is relative to the
 specified screen.
 Will usually only work with "\-fstype \-fullscreen" or "\-fstype none".
+This option is not suitable to only set the startup screen (and not also the
+fullscreen screen), \-geometry is the best that is available for that purpose
+currently.
 .
 .TP
 .B \-zrbw (\-vo zr only)
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index a5144ed389..9479e66411 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27236
+.\" synced with r27337
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -3044,7 +3044,6 @@ Géré uniquement par les pilotes de sortie vidéo fbdev, dga, svga, vesa.
 Joue la vidéo avec les bordures et décorations de fenêtre (par défaut).
 Spécifiez \-noborder pour désactiver les décorations de fenêtre
 standard.
-Supporté par le pilote de sortie vidéo directx.
 .
 .TP
 .B \-brightness <\-100\-100>
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index 86424a92fe..d765a0e22a 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27236
+.\" synced with r27337
 .\" Encoding: iso-8859-1
 .\" MPlayer (C) 2000-2008 MPlayer Team
 .\" Questa pagina di manuale è stata fatta da Gabucino, Diego Biurrun,
@@ -3011,7 +3011,6 @@ Supportato solo dai driver di uscita video fbdev, dga, svga e vesa.
 Riproduce il filmato in una finestra con bordi e decorazioni.
 Dato che questo è il default, usa \-noborder per disabilitare le decorazioni
 standard della finestra.
-Supportato dal driver di uscita video directx.
 .
 .TP
 .B \-brightness <\-100\-100>
diff --git a/DOCS/tech/mirrors/mirror_howto.txt b/DOCS/tech/mirrors/mirror_howto.txt
index 92dbe81fd2..054e8971b9 100644
--- a/DOCS/tech/mirrors/mirror_howto.txt
+++ b/DOCS/tech/mirrors/mirror_howto.txt
@@ -48,7 +48,7 @@ Requirements
 ~~~~~~~~~~~~
 The requirements for any (official) mirror are:
 1) rsync installed and some way to run the sync script periodicaly (eg cron)
-2) subscribing to the mplayer-mirror mailinglist (see below)
+2) subscribing to the mplayer-mirror mailing list (see below)
 
 The requirements for a full website mirror are:
 1) 500MB of free disk space (for the ftp and homepage directories).
@@ -188,21 +188,46 @@ appear to default to defining a standard charset. This breaks our documentation
 translations, which are written in different encodings.
 
 The second VirtualHost is necessary for the DNS round-robin address.
+To check whether this VirtualHost works, you can add a temporary entry into
+your /etc/hosts file:
+
+1.2.3.4 www.mplayerhq.hu
+
+Replace the IP address by the real IP address of your mirror. Do not forget to
+remove the entry after you finish testing.
+
+
+Webserver checklist
+~~~~~~~~~~~~~~~~~~~
+
+After setting up the web server, please verify that the following things work
+both for your mirror address (www#.mplayerhq.hu) and the DNS round-robin
+address (www.mplayerhq.hu):
+
+- The virtual host is reachable by its address.
+- The subdirectories MPlayer, DOCS and homepage work.
+- The man pages and documentation are served with the correct content-type.
+  Try Russian or Chinese, you will notice breakage immediately.
 
 
 Setting up an FTP server
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Any FTP server will do. We use vsftpd, it's fast and secure. You should have
-the same directory layout as we do on our server, so there should be a
-subdirectory named 'MPlayer' (notice the capitals) that contains the
-downloadable files.
+Any FTP server will do. We use vsftpd, it is fast and secure. The setup is
+similar to the web server setup. The FTP server should listen on both its mirror
+address (ftp#.mplayerhq.hu) and the DNS round-robin address (ftp.mplayerhq.hu).
+All our mirrors are public, so you should allow anonymous access.
 
+You should have the same directory layout as we do on our server, so there
+should be a subdirectory named 'MPlayer' (notice the capitals) that contains
+the downloadable files.
 
-Mailinglist
-~~~~~~~~~~~
+
+Mailing list
+~~~~~~~~~~~~
 
 All official mirror admins are required to subscribe to the mplayer-mirror
-mailinglist. It's used to coordinate the efforts and distribute information
+mailing list. It's used to coordinate the efforts and distribute information
 among all admins. It is also very low traffic. Please use the webinterface
 on http://lists.mplayerhq.hu/mailman/listinfo/mplayer-mirror to subscribe.
+Please do not top-post on this mailing list.