From 2ac4d0d1fb54b5f4686fc30660aa8c33d720a1b8 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 9 May 2009 18:13:48 +0000
Subject: Move image formats section to a more appropriate place.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29284 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/skin.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml
index 2be4e940d4..93f4f1934b 100644
--- a/DOCS/xml/en/skin.xml
+++ b/DOCS/xml/en/skin.xml
@@ -50,18 +50,6 @@ listed above, for example:
 
 <!-- ********** -->
 
-<sect2 id="skin-overview-formats">
-<title>Image formats</title>
-
-<para>Images must be truecolor (24 or 32 bpp) PNGs.</para>
-<para>
-In the main window and in the playbar (see below) you can use images with
-`transparency': Regions filled with the color #FF00FF (magenta) are fully
-transparent when viewed by <application>MPlayer</application>. This means
-that you can even have shaped windows if your X server has the XShape extension.
-</para>
-</sect2>
-
 <sect2 id="skin-overview-components">
 <title>Skin components</title>
 
@@ -162,6 +150,18 @@ they are clicked.
 </para>
 </sect2>
 
+<sect2 id="skin-overview-formats">
+<title>Image formats</title>
+
+<para>Images must be truecolor (24 or 32 bpp) PNGs.</para>
+<para>
+In the main window and in the playbar (see below) you can use images with
+`transparency': Regions filled with the color #FF00FF (magenta) are fully
+transparent when viewed by <application>MPlayer</application>. This means
+that you can even have shaped windows if your X server has the XShape extension.
+</para>
+</sect2>
+
 <!-- ********** -->
 
 <sect2 id="skin-files">
-- 
cgit v1.2.3


From b4f1c69f87731c4e0d65a9612e2c5c065f0ede3b Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 9 May 2009 18:47:18 +0000
Subject: Remove redundant information about configuring MPlayer for GUI
 support.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29285 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/skin.xml | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml
index 93f4f1934b..d2ace85c22 100644
--- a/DOCS/xml/en/skin.xml
+++ b/DOCS/xml/en/skin.xml
@@ -6,48 +6,6 @@
 <sect1 id="skin-overview">
 <title>Overview</title>
 
-<para>
-It does not really have anything to do with the skin format, but you should
-know that <application>MPlayer</application> has
-<emphasis role="bold">no</emphasis> builtin skin, so
-<emphasis role="bold">at least one skin must be installed in order to be able
-to use the GUI.</emphasis>
-</para>
-
-<!-- ********** -->
-
-<sect2 id="skin-overview-directories">
-<title>Directories</title>
-
-<para>
-The directories searched for skins are (in order):
-<orderedlist>
-<listitem><para>
-  <filename class="directory">$(DATADIR)/skins/</filename>
-</para></listitem>
-<listitem><para>
-  <filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
-</para></listitem>
-<listitem><para>
-  <filename class="directory">~/.mplayer/skins/</filename>
-</para></listitem>
-</orderedlist>
-</para>
-
-<para>
-Note that the first path may vary according to the way
-<application>MPlayer</application> was configured (see the
-<option>--prefix</option> and <option>--datadir</option>
-arguments of the <command>configure</command> script).
-</para>
-
-<para>
-Every skin is installed into its own directory under one of the directories
-listed above, for example:
-<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
-</para>
-</sect2>
-
 <!-- ********** -->
 
 <sect2 id="skin-overview-components">
-- 
cgit v1.2.3


From 58931b2f123be4d5276b0f397d0792090bcce0e7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 12 May 2009 15:00:32 +0000
Subject: Fix IPv4 vs. IPv6 typo, closes Bugzilla #1439. noticed by Loic
 Pefferkorn, loic-mplayer loicp eu

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29302 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/man/fr/mplayer.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'DOCS')

diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 55a88f45c9..8f91a8dbdb 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1647,7 +1647,7 @@ Se rabat automatiquement sur IPv6.
 .
 .TP
 .B \-prefer\-ipv6 (réseau IPv6 uniquement)
-Utilise IPv4 pour les connections réseau.
+Utilise IPv6 pour les connections réseau.
 Se rabat automatiquement sur IPv4.
 .
 .TP
-- 
cgit v1.2.3