Merge svn changes up to r29304

2 files changed, 13 insertions, 55 deletions

diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index a5148bb8fe..a2f2022bbe 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
diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml
index 2be4e940d4..d2ace85c22 100644
--- a/DOCS/xml/en/skin.xml
+++ b/DOCS/xml/en/skin.xml
@@ -6,62 +6,8 @@
 <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-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 +108,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">