- add improvements by Aragorn

- adjusted text to changed behaviour of Add button
- remove wrong file

2 files changed, 23 insertions, 31 deletions

diff --git a/docs/mcc-help/en/drakrpm-edit-media.xml b/docs/mcc-help/en/drakrpm-edit-media.xml
index 7a213307..ee667a7e 100644
--- a/docs/mcc-help/en/drakrpm-edit-media.xml
+++ b/docs/mcc-help/en/drakrpm-edit-media.xml
@@ -6,6 +6,10 @@
   </info>
 
   <!-- 2013-01-06 marja - added Qilaq's and spturtle's corrections -->
+  <!--2013-10-22 marja - improved wording, thanks to Aragorn :-) 
+                       - adjusted "Add" part to changed behaviour of this tool
+		       (no longer a choice to only add "update sources" is
+		       given) -->
 
   <mediaobject>
     <imageobject>
@@ -14,15 +18,16 @@
   </mediaobject>
 
   <para><important>
-      <para>First thing to do after an install is to add software sources (as
+      <para>First thing to do after an install is to add software sources (also
       known as repositories, media, mirrors). That means you must select the
       media sources to be used to install and update packages and
       applications. (see Add button below).</para>
     </important><note>
-      <para>Your system is running under an architecture than may be 32-bit
-      called i586, or 64-bit called x86_64. Take care to choose repositories
-      that suit your system or are not dependent of the architecture, these
-      are called noarch packages.</para>
+      <para>Your system is running under an architecture which may be 32-bit
+      (called i586), or 64-bit (called x86_64). Some packages are independent
+      of whether your system is 32-bit or 64-bit; these are called noarch
+      packages. They don't have their own noarch directories on the mirrors,
+      but are all in both the i586 and the x86_64 media.</para>
     </note></para>
 
   <para>This tool is present in the Mageia Control Center under the tab
@@ -113,18 +118,20 @@
 
     <para><guibutton>Add:</guibutton></para>
 
-    <para>Add the official repositories available on the internet. These
-    repositories contains only sure and well tested software. Clicking on the
-    add button opens a pop up window giving the choices of installing the
-    "Update sources only" or the "Full set of sources". The first choice the
-    essential, the second is more useful.</para>
+    <para>Add the official repositories available on the Internet. These
+    repositories contain only safe and well tested software. Clicking on the
+    "Add" button adds the mirrorlist to your configuration, it is designed to
+    make sure that you install and update from a mirror close to you. If you
+    prefer to choose a specific mirror, then add it by choosing "Add a 
+    specific media mirror" from the drop-down "File" menu.</para>
 
     <para><guibutton>Up and down arrows:</guibutton></para>
 
     <para>Change the list order. When Drakrpm looks for a package, it reads
-    the list in the displayed order and will install the first found package
-    (for a same release number, if not, the last release will be installed).
-    So if possible, place the fastest repositories on the top.</para>
+    the list in the displayed order and will install the first package found
+    for the same release number - in the event of a version mismatch, the
+    latest release will be installed. So if possible, put the fastest
+    repositories at the top.</para>
   </section>
 
   <section>
@@ -148,7 +155,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="drakrpmEditMedia2.png"/>
+	      <imagedata fileref="drakrpmEditMedia2.png"/>
       </imageobject>
     </mediaobject>
 
@@ -194,4 +201,5 @@
     hostname</guibutton> and if necessary a <guilabel>Username</guilabel> and
     <guilabel>Password</guilabel>.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/docs/mcc-help/en/drakx-intro.xml b/docs/mcc-help/en/drakx-intro.xml
deleted file mode 100644
index 8f66285c..00000000
--- a/docs/mcc-help/en/drakx-intro.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="drakx-intro" role="titlepage">
-  <info>
-    <title xml:id="drakx-intro-ti1">About the Installer Help Manual</title>
-  </info>
-
-  <note>
-    <para>No one will see all the installer screens that you see in this
-    manual. Which screens you will see, depends on your hardware and the
-    choices you make while installing.</para>
-  </note>
-
-  <para>The texts and screenshots in this manual are available under the CC
-  BY-SA 3.0 license <link xlink:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
-
-  <para>This manual was produced with the help of the <link xlink:href="http://www.calenco.com">Calenco CMS</link> developed by <link xlink:href="http://www.neodoc.biz">NeoDoc</link></para>
-</section>
\ No newline at end of file