Update MCC catalog

5 files changed, 12 insertions, 80 deletions

diff --git a/docs/docs/stable/mcc-help/en/MCC-cover.xml b/docs/docs/stable/mcc-help/en/MCC-cover.xml
index 8cd111b0..a7a3248a 100644
--- a/docs/docs/stable/mcc-help/en/MCC-cover.xml
+++ b/docs/docs/stable/mcc-help/en/MCC-cover.xml
@@ -14,7 +14,7 @@
       <para role="tagline">The tools to configure the Mageia system</para>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mageia-2013.png"/>
+          <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
diff --git a/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml b/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
index 84968053..559dd135 100644
--- a/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
+++ b/docs/docs/stable/mcc-help/en/diskdrake--fileshare.xml
@@ -8,7 +8,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata  fileref="diskdrake--fileshare.png" revision="1" xml:id="diskdrake--fileshare-im1" align="center" format="PNG" />
+      <imagedata format="PNG" fileref="diskdrake--fileshare.png" xml:id="diskdrake--fileshare-im1" align="center" revision="1"/>
     </imageobject>
   </mediaobject>
 
diff --git a/docs/docs/stable/mcc-help/en/draknetcenter.xml b/docs/docs/stable/mcc-help/en/draknetcenter.xml
index 4c93975c..6de88f47 100644
--- a/docs/docs/stable/mcc-help/en/draknetcenter.xml
+++ b/docs/docs/stable/mcc-help/en/draknetcenter.xml
@@ -1,33 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="draknetcenter" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:id="draknetcenter">
   <!-- Written AM desmottes (lebarhon) 2012-08-31 
 Write some text means i can't do it :(
 What must we say about networks out of wired (Ethernet) and wireless (WI fi) like GPRS, bluetooth ? I can't write anything.
 -->
-
   <!-- -->
-
   <info>
     <title xml:id="draknetcenter-ti1">Network Center</title>
-
     <subtitle>draknetcenter</subtitle>
   </info>
-
   <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="draknetcenter.png" align="center" format="PNG" xml:id="draknetcenter-im1"/>
+      <imagedata format="PNG" fileref="draknetcenter.png" align="center" xml:id="draknetcenter-im1" revision="1"/>
     </imageobject>
   </mediaobject>
-
-  <para>This tool<footnote>
-      <para>You can start this tool from the command line, by typing <emphasis role="bold">draknetcenter</emphasis> as root.</para>
-    </footnote> is found under the Network &amp; Internet tab in the Mageia
+  <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">draknetcenter</emphasis> as root.</para></footnote> is found under the Network &amp; Internet tab in the Mageia
   Control Center labelled "Network Center"</para>
-
   <para/>
-
   <section>
     <title>Introduction</title>
-
     <para>When this tool is launched, a window opens listing all the networks
     configured on the computer, whatever their type (wired, wireless,
     satellite, etc.). When clicking on one of them, three or four buttons
@@ -35,30 +25,12 @@ What must we say about networks out of wired (Ethernet) and wireless (WI fi) lik
     network, change its settings or connect/disconnect. This tool isn't
     intended to create a network, for this see <guilabel>Set up a new network
     interface (LAN, ISDN, ADSL, ...)</guilabel> in the same MCC tab.</para>
-
     <para>In the screenshot below, given as example, we can see two networks,
     the first one is wired and connected, recognizable by this icon
-    <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref="../draknetcenterEthernet-on.png"/>
-        </imageobject>
-      </inlinemediaobject> (this one is not connected<inlinemediaobject>
-        <imageobject>
-          <imagedata fileref="../draknetcenterEthernet-off.png"/>
-        </imageobject>
-      </inlinemediaobject> ) and the second section shows wireless networks,
-    not connected recognizable by this icon <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref="../draknetcenterWireless-off.png"/>
-        </imageobject>
-      </inlinemediaobject> and this one <inlinemediaobject>
-        <imageobject>
-          <imagedata fileref="../draknetcenterWireless-on.png"/>
-        </imageobject>
-      </inlinemediaobject>if connected. For the other network types, the
+    <inlinemediaobject><imageobject><imagedata fileref="../draknetcenterEthernet-on.png"/></imageobject></inlinemediaobject> (this one is not connected<inlinemediaobject><imageobject><imagedata fileref="../draknetcenterEthernet-off.png"/></imageobject></inlinemediaobject> ) and the second section shows wireless networks,
+    not connected recognizable by this icon <inlinemediaobject><imageobject><imagedata fileref="../draknetcenterWireless-off.png"/></imageobject></inlinemediaobject> and this one <inlinemediaobject><imageobject><imagedata fileref="../draknetcenterWireless-on.png"/></imageobject></inlinemediaobject>if connected. For the other network types, the
     colour code is always the same, green if connected and red if not
     connected.</para>
-
     <para>In the wireless part of the screen, you can also see all the
     detected networks, with the <guilabel>SSID</guilabel>, the
     <guilabel>Signal strengh</guilabel>, if they are encrypted (in red) or not
@@ -68,148 +40,108 @@ What must we say about networks out of wired (Ethernet) and wireless (WI fi) lik
     possible here to go from a network to another one. If a private network is
     selected, the Network Settings window (see below) will open and ask you
     for extra settings ( an encryption key in particular).</para>
-
     <para>Click on <guibutton>Refresh</guibutton> to update the screen.</para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter1.png"/>
       </imageobject>
     </mediaobject>
-
-    <para/>
   </section>
-
   <section>
     <title>The Monitor button</title>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter4.png"/>
       </imageobject>
     </mediaobject>
-
     <para>This button allows you to watch the network activity, downloads
     (toward the PC, in red) and uploads (toward the Internet, in green). The
     same screen is available by right clicking on the <guimenu>Internet icon
     in the system tray -> Monitor Network</guimenu>.</para>
-
     <para>There is a tab for each network (here eth0 is the wired network, lo
     the local loopback and wlan0 the wireless network) and a tab connection
     which gives details about connection status.</para>
-
     <note>
       <para>At the bottom of the window is a title <guilabel>Traffic
       accounting</guilabel>, we will look at that in the next section.</para>
     </note>
   </section>
-
   <section>
     <title>The Configure button</title>
-
     <para><emphasis role="bold">A - For a wired network</emphasis></para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter2.png"/>
       </imageobject>
     </mediaobject>
-
     <para>It is possible to change all the settings given during network
     creation. Most of the time, checking <guibutton>Automatic IP</guibutton>
     <guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems,
     manual configuration may give better results.</para>
-
     <para>For a residential network, the <guilabel>IP address</guilabel>
     always looks like 192.168.0.x, <guilabel>Netmask</guilabel> is
     255.255.255.0, and the <guilabel>Gateway</guilabel> and <guilabel>DNS
     servers</guilabel> are available from your providers website.</para>
-
     <para><guibutton>Enable traffic accounting</guibutton> if checked this
     will count the traffic on a hourly, daily or monthly basis. The results
     are visible in the Network monitor detailed in the previous section. Once
     enabled, you may have to reconnect to the network.</para>
-
     <para><emphasis role="bold">Allow interface to be controlled by Network
     Manager:</emphasis></para>
-
     <para>This section hasn't been written yet for lack of resources. If you
     think you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc
     team.</link> Thanking you in advance.</para>
-
     <para><guibutton>The button Advanced:</guibutton></para>
-
     <para>This section hasn't been written yet for lack of resources. If you
     think you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc
     team.</link> Thanking you in advance.</para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter5.png"/>
       </imageobject>
     </mediaobject>
-
     <para><emphasis role="bold">B - For a wireless network</emphasis></para>
-
     <para>Only the items not already seen above are explained.</para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter3.png"/>
       </imageobject>
     </mediaobject>
-
     <para><emphasis role="bold">Operating mode:</emphasis></para>
-
     <para>Select <guilabel>Managed</guilabel> if the connection is via an
     access point, there is an <emphasis role="bold">ESSID</emphasis> detected.
     Select <guilabel>Ad-hoc</guilabel> if it is a peer to peer network. Select
     <emphasis role="bold">Master</emphasis> if your network card is used as
     the access point, your network card needs to support this mode.</para>
-
     <para><emphasis role="bold">Encryption mode and Encryption
     key:</emphasis></para>
-
     <para>If it is a private network, you need to know these settings.</para>
-
     <para><guilabel>WEP</guilabel> uses a password and is weaker than WPA
     which uses a passphrase. <guilabel>WPA Pre-Shared Key</guilabel> is also
     called WPA personal or WPA home. <guilabel>WPA Enterprise</guilabel> is
     not often used in private networks.</para>
-
     <para><emphasis role="bold">Allow access point roaming</emphasis>:</para>
-
     <para>Roaming is a technology which enables allows computer to change its
     access point while remaining connected to the network.</para>
-
     <para><guibutton>The button Advanced:</guibutton></para>
-
     <para>This page hasn't been written yet for lack of resources. If you
     think you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc
     team.</link> Thanking you in advance.</para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter6.png"/>
       </imageobject>
     </mediaobject>
-
-    <para/>
   </section>
-
   <section>
     <title>The Advanced Settings button</title>
-
     <para>This section hasn't been written yet for lack of resources. If you
     think you can write this help, please contact <link ns2:href="https://wiki.mageia.org/en/Documentation_team"> the Doc
     team.</link> Thanking you in advance.</para>
-
     <mediaobject>
       <imageobject>
         <imagedata fileref="draknetcenter7.png"/>
       </imageobject>
     </mediaobject>
-
-    <para/>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/mcc-help/en/msecgui.xml b/docs/docs/stable/mcc-help/en/msecgui.xml
index c08a5b0e..161c25d6 100644
--- a/docs/docs/stable/mcc-help/en/msecgui.xml
+++ b/docs/docs/stable/mcc-help/en/msecgui.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="msecgui" version="5.0">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="msecgui">
   <info>
     <title xml:id="msecgui-ti1">MSEC: System Security and Audit</title>
 
@@ -10,7 +10,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata format="PNG" xml:id="msecgui-im1" fileref="msecgui.png" align="center" revision="1"/>
+      <imagedata xml:id="msecgui-im1" revision="1" fileref="msecgui.png" align="center" format="PNG"/>
     </imageobject>
   </mediaobject>
 
@@ -369,4 +369,4 @@
     </emphasis>.</para></caution>
    </section>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/mcc-help/en/rpmdrake.xml b/docs/docs/stable/mcc-help/en/rpmdrake.xml
index 05120705..89c96d32 100644
--- a/docs/docs/stable/mcc-help/en/rpmdrake.xml
+++ b/docs/docs/stable/mcc-help/en/rpmdrake.xml
@@ -8,7 +8,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata xml:id="rpmdrake-im1" revision="1" fileref="rpmdrake.png" align="center" format="PNG"/>
+      <imagedata format="PNG" xml:id="rpmdrake-im1" align="center" fileref="rpmdrake.png" revision="1"/>
     </imageobject>
   </mediaobject>
 
@@ -147,7 +147,7 @@
     <para><table>
         <title/>
 
-        <tgroup cols="2" align="left">
+        <tgroup align="left" cols="2">
           <colspec align="center"/>
 
           <thead>