Update addUser.xml and catalog

1 files changed, 9 insertions, 43 deletions

diff --git a/docs/docs/stable/installer/en/addUser.xml b/docs/docs/stable/installer/en/addUser.xml
index 13e08249..fbb69ad8 100644
--- a/docs/docs/stable/installer/en/addUser.xml
+++ b/docs/docs/stable/installer/en/addUser.xml
@@ -1,42 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:id="addUser">
   <info>
     <title xml:id="addUser-ti1">User Management</title>
   </info>
-
   <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-
   <!--2018/02/12 apb: Text and Typography.-->
-
   <!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
-
   <!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
   Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
-
   <!--2018/02/24 apb: Changed list style.-->
-
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata align="center" fileref="dx2-setRootPassword.png" format="PNG"
-                 revision="1" xml:id="setRootPassword-im1"/>
+      <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
-
     <imageobject>
-      <imagedata fileref="live-user1.png" format="PNG"/>
+      <imagedata format="PNG" fileref="live-user1.png"/>
     </imageobject>
   </mediaobject>
-
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)
       Password:</title>
     </info>
-
     <para>It is advisable for all Mageia installations to set a
     <literal>superuser</literal> (Administrator) password, usually called the
     <emphasis>root </emphasis>password in Linux. As you type a password into
@@ -44,80 +28,64 @@
     the strength of the password. A green shield shows you are using a strong
     password. You need to repeat the same password in the box underneath, to
     check that the first entry was not mistyped.</para>
-
     <note xml:id="givePassword">
       <para>All passwords are case-sensitive. It is best to use a mixture of
       letters (upper and lower case), numbers and other characters in a
       password.</para>
     </note>
   </section>
-
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Enter a user</title>
     </info>
-
     <para>Add a User here. A regular user has fewer privileges than the
     <literal>superuser</literal> (root), but enough to use the Internet,
     office applications or play games and anything else the average user might
     use a computer for.</para>
-
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Icon</emphasis></para>
-
         <para>Click on this button if you want to change the user's
         icon</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Real Name</emphasis></para>
-
         <para>Insert the user's real name into this text box</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Login Name</emphasis></para>
-
         <para>Enter the user login name or let DrakX use a version of the
         user's real name. <emphasis role="bold">The login name is
         case-sensitive.</emphasis></para>
+        <caution condition="live">
+          <simpara>The login entered here should be different to any login currently in use for your <filename>/home</filename> directory. Some user parameters will be written in the user space, and some can overwrite actual data such as Firefox, Thunderbird or Kmail data...</simpara>
+        </caution>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Password</emphasis></para>
-
         <para>Type in the user password. There is a shield at the end of the
-        text box that indicates the strength of the password. (See also <xref
-        linkend="givePassword"/>)</para>
-
+        text box that indicates the strength of the password. (See also <xref linkend="givePassword"/>)</para>
         <para><emphasis role="bold">Password (again):</emphasis> Retype the
         user password. DrakX will check that you have not mistyped the
         password.</para>
       </listitem>
     </itemizedlist>
-
     <note>
       <para>Any users added while installing Mageia, will have a home
       directory that is both read and write protected (umask=0027)</para>
-
       <para>You can add any extra needed users in the <emphasis>Configuration
       - Summary</emphasis> step during the install. Choose <emphasis>User
       management</emphasis>.</para>
-
       <para>The access permissions can also be changed after the
       install.</para>
     </note>
   </section>
-
-  <section condition="classical" xml:id="addUserAdvanced">
+  <section xml:id="addUserAdvanced" condition="classical">
     <info>
       <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-
     <para>The <emphasis>Advanced</emphasis> option allows you to edit further
     settings for the user you are adding.</para>
-
     <itemizedlist>
       <listitem>
         <para><emphasis>Shell</emphasis>: This drop-down list allows you to
@@ -125,17 +93,15 @@
         screen. Options are <literal>Bash</literal>, <literal>Dash</literal>
         and <literal>Sh</literal></para>
       </listitem>
-
       <listitem>
         <para><emphasis>User ID</emphasis>: Here you can set the user ID for
         any user you added in the previous screen. If you are unsure what the
         purpose of this is, then leave it blank.</para>
       </listitem>
-
       <listitem>
         <para><emphasis>Group ID</emphasis>: This lets you set the group ID.
         Again, if unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
+</section>
\ No newline at end of file