diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-23 20:56:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-23 20:56:50 +0200 |
| commit | 0406d951209df261970424256d76f293649ec140 (patch) | |
| tree | 622259272e33995869f234cf18f76201e5272241 /DOCS | |
| parent | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (diff) | |
| parent | 39b7c1576d826cfd72f34a3491a094d07b3d7041 (diff) | |
| download | mpv-0406d951209df261970424256d76f293649ec140.tar.bz2 mpv-0406d951209df261970424256d76f293649ec140.tar.xz | |
Merge svn changes up to r28348
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/fr/mplayer.1 | 5 | ||||
| -rw-r--r-- | DOCS/tech/mirrors/mirror_howto.txt | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 250f131ce3..3294871447 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r28279 +.\" synced with r28341 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2009 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -3738,7 +3738,8 @@ pilote de sortie vidéo CoreVideo pour Mac OS X .PD 0 .RSs .IPs device_id=<numéro> -Choisir le moniteur à utiliser en plein-écran. +Choisir le moniteur à utiliser en plein-écran (par défaut\ : -1). +La valeur -1 laisse la vidéo sur le même écran. .IPs shared_buffer Écrit la sortie dans un tampon partagé au lieu de l'afficher, et essaye d'établir une NSConnection avec une IHM existante. diff --git a/DOCS/tech/mirrors/mirror_howto.txt b/DOCS/tech/mirrors/mirror_howto.txt index 054e8971b9..37a3d9cdfd 100644 --- a/DOCS/tech/mirrors/mirror_howto.txt +++ b/DOCS/tech/mirrors/mirror_howto.txt @@ -160,15 +160,13 @@ Setting up a webserver Set up Apache or whatever web server you prefer. We just have static pages, so no fancy configuration is necessary. However, we need a few aliases so that links on our pages work correctly. /MPlayer and /DOCS should redirect to the -directory with the downloadable files and /homepage should redirect to the -directory with the HTML pages. +directory with the downloadable files. Here is an example stanza to paste into your Apache configuration: <VirtualHost www#.mplayerhq.hu> DocumentRoot /path/to/htdocs Options FollowSymLinks Indexes - Alias /homepage /path/to/htdocs Alias /MPlayer /path/to/MPlayer Alias /DOCS /path/to/MPlayer/DOCS AddDefaultCharset off @@ -177,7 +175,6 @@ Here is an example stanza to paste into your Apache configuration: <VirtualHost www.mplayerhq.hu> DocumentRoot /path/to/htdocs Options FollowSymLinks Indexes - Alias /homepage /path/to/htdocs Alias /MPlayer /path/to/MPlayer Alias /DOCS /path/to/MPlayer/DOCS AddDefaultCharset off @@ -205,7 +202,7 @@ 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 MPlayer and DOCS subdirectories work. - The man pages and documentation are served with the correct content-type. Try Russian or Chinese, you will notice breakage immediately. |