Update from Calenco

7 files changed, 49 insertions, 5 deletions

diff --git a/docs/installer/en/configureServices.xml b/docs/installer/en/configureServices.xml
index cf511de7..083977a3 100644
--- a/docs/installer/en/configureServices.xml
+++ b/docs/installer/en/configureServices.xml
@@ -14,6 +14,14 @@
     </info>
 
     <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
+   <!-- 2013-05-05 marja - added screenshot -->
+
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-configureServices.png" width="800" align="center" format="PNG" depth="600" xml:id="configureServices-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
 
 
     <para revision="1" xml:id="configureServices-pa1">Here you can set
diff --git a/docs/installer/en/configureTimezoneUTC.xml b/docs/installer/en/configureTimezoneUTC.xml
index 121e027b..520fc0e3 100644
--- a/docs/installer/en/configureTimezoneUTC.xml
+++ b/docs/installer/en/configureTimezoneUTC.xml
@@ -14,6 +14,13 @@
     </info>
 
     <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
+    <!-- 2013-05-05 marja - added screenshot -->
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png" width="800" align="center" format="PNG" depth="600" xml:id="configureTimezoneUTC-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
 
 
     <para revision="1" xml:id="configureTimezoneUTC-pa1">Choose your
diff --git a/docs/installer/en/minimal-install.xml b/docs/installer/en/minimal-install.xml
index f6bec3be..070d43f6 100644
--- a/docs/installer/en/minimal-install.xml
+++ b/docs/installer/en/minimal-install.xml
@@ -4,14 +4,22 @@
     </info>
 
     <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+    <!--2013-05-05 marja - added screenshot and s/next/related/ -->
 
     <para>You can choose a Minimal Installation by de-selecting everything in the Package Group Selection screen, see <xref linkend="choosePackageGroups"></xref>.</para>
     <para>Minimal Installation is intended for those with specific uses in mind for their
     <application>Mageia</application>, such as a server or a specialised
     workstation. You will probably use this option combined with Manual
     Package Selection, see <xref linkend="choosePackagesTree"></xref>.</para>
-    <para>If you choose this installation class, then the next
+    <para>If you choose this installation class, then the related
     screen will offer you a few useful extras to install, such as
     documentation and X.</para>
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-minimal-install.png" width="800" align="center" format="PNG" depth="600" xml:id="minimal-install-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+
   </section>
 
diff --git a/docs/installer/en/securityLevel.xml b/docs/installer/en/securityLevel.xml
index 6bb3d487..bd3c8fd1 100644
--- a/docs/installer/en/securityLevel.xml
+++ b/docs/installer/en/securityLevel.xml
@@ -13,6 +13,13 @@
     </info>
 
  <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
+ <!-- 2013-05-05 marja - added screenshot -->
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-securityLevel.png" width="800" align="center" format="PNG" depth="600" xml:id="securityLevel-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
 
     <para revision="1" xml:id="securityLevel-pa1">You can adjust your
     security level here.</para>
diff --git a/docs/installer/en/selectCountry.xml b/docs/installer/en/selectCountry.xml
index 1f6a7209..636fff85 100644
--- a/docs/installer/en/selectCountry.xml
+++ b/docs/installer/en/selectCountry.xml
@@ -15,6 +15,14 @@
     </info>
 
     <!-- 2012-12-25 marja - moved this section out of misc-params -->
+   <!-- 2013-05-05 marja - added screenshot -->
+
+<mediaobject>
+    <imageobject>
+      <imagedata revision="1" fileref="dx2-selectCountry.png" width="800" align="center" format="PNG" depth="600" xml:id="selectCountry-im1"></imagedata>
+    </imageobject>
+  </mediaobject>
+
 
     <para revision="2" xml:id="selectCountry-pa1">Select your country
     or region. This is important for all kinds of settings, like the currency
diff --git a/docs/installer/en/selectInstallClass.xml b/docs/installer/en/selectInstallClass.xml
index e4cf6c75..21c78860 100644
--- a/docs/installer/en/selectInstallClass.xml
+++ b/docs/installer/en/selectInstallClass.xml
@@ -17,6 +17,7 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 
   <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
+  <!-- 2013-05-05 marja, corrected typo in screenshot name, removed depth="600" -->
 
   <info>
     <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
@@ -24,8 +25,7 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata fileref="dx2-selectinstallClass.png" align="center" width="100%" format="PNG"
-       depth="600"></imagedata>
+      <imagedata fileref="dx2-selectInstallClass.png" align="center" width="100%" format="PNG"></imagedata>
     </imageobject>
   </mediaobject>
 
diff --git a/docs/installer/en/takeOverHdConfirm.xml b/docs/installer/en/takeOverHdConfirm.xml
index e0d22c47..837bf83b 100644
--- a/docs/installer/en/takeOverHdConfirm.xml
+++ b/docs/installer/en/takeOverHdConfirm.xml
@@ -7,14 +7,20 @@
 
   <!-- Made by marja on 2012 04 03 -->
 
-  <!-- NEEDS TO BE REVIEWED! -->
-
   <!-- test comment - johnr -->
   
   <!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 
+  <!-- 2013-05-05 marja added screenshot -->
+
+<mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center" width="800" depth="600"></imagedata>
+      </imageobject>
+    </mediaobject>
+
   <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on
   <guibutton>Previous</guibutton> if you are not sure about your choice.</para>