Add a file and modify others, date and time are now configured early (mga#34909)

7 files changed, 91 insertions, 25 deletions

diff --git a/docs/docs/stable/installer/en/DrakLive.xml b/docs/docs/stable/installer/en/DrakLive.xml
index 1f698ff3..356e9c39 100644
--- a/docs/docs/stable/installer/en/DrakLive.xml
+++ b/docs/docs/stable/installer/en/DrakLive.xml
@@ -13,6 +13,7 @@
 b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
 
   <!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
+  <!--2026-01-30 marja: replace configureTimezoneUTC.xml with configureTimezone.xml, because bestTime.xml is about UTC for a Live install and configureTimezoneUTC.xml will be about UTC for traditional installer (mga#34909)-->
 
   <info>
     <title>Installation from LIVE medium</title>
@@ -47,7 +48,7 @@ b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdr
 
   <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="configureTimezone.xml"/>
 
   <xi:include href="bestTime.xml"/>
 
diff --git a/docs/docs/stable/installer/en/DrakX-inline.xml b/docs/docs/stable/installer/en/DrakX-inline.xml
index 354dcd0e..f07d744e 100644
--- a/docs/docs/stable/installer/en/DrakX-inline.xml
+++ b/docs/docs/stable/installer/en/DrakX-inline.xml
@@ -32,6 +32,8 @@
 
   <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
 
+  <!--2026-01-30 add configureTimezone.xml before configureTimezoneUTC.xml and make both appear immediately after acceptLicence.xml, too, see mga#34909-->
+
   <!-- <xi:include href="drakx-intro.xml"/> -->
 
   <xi:include href="SelectAndUseISOs2.xml"/>
@@ -42,6 +44,10 @@
 
   <xi:include href="acceptLicense.xml"/>
 
+  <xi:include href="configureTimezone.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
   <xi:include href="setupSCSI.xml"/>
 
   <xi:include href="selectInstallClass.xml"/>
@@ -96,8 +102,14 @@
 
   <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <!-- hide these two entries, in case including them a second time is the reason
+  that this file cannot be uploaded into Calenco 
+
+  <xi:include href="configureTimezone.xml"/>
 
+  <xi:include href="configureTimezoneUTC.xml"/>
+  -->
+  
   <xi:include href="selectCountry.xml"/>
 
   <xi:include href="configureServices.xml"/>
@@ -115,4 +127,4 @@
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/en/DrakX.xml b/docs/docs/stable/installer/en/DrakX.xml
index 1393c5f2..e923a83d 100644
--- a/docs/docs/stable/installer/en/DrakX.xml
+++ b/docs/docs/stable/installer/en/DrakX.xml
@@ -32,6 +32,12 @@
   <!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
 
   <!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+
+  <!--2026-01-31 marja: include configureTimezone.xml and configureTimezoneUTC.xml
+  after acceptLicense.xml, because that is where they now first appear in the
+installer. (configureTimezoneUTC.xml has been removed from Locale.xml)-->
+  
+
   <info>
     <title>Installation with DrakX</title>
 
@@ -67,6 +73,10 @@
 
   <xi:include href="acceptLicense.xml"/>
 
+  <xi:include href="configureTimezone.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
   <xi:include href="setupSCSI.xml"/>
 
   <xi:include href="selectInstallClass.xml"/>
diff --git a/docs/docs/stable/installer/en/configureTimezone.xml b/docs/docs/stable/installer/en/configureTimezone.xml
new file mode 100644
index 00000000..c22d7db7
--- /dev/null
+++ b/docs/docs/stable/installer/en/configureTimezone.xml
@@ -0,0 +1,33 @@
+<?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" xreflabel="Configure Timezone" xml:id="configureTimezone" version="5.0">
+  <info>
+    <title xml:id="configureTimezone-ti6">Configure your Timezone</title>
+  </info>
+
+  <!--2026-01-30 marja:a started this page by copying configureTimezoneUTC.xml,
+  because that file better matched this screen and because Martin created a help
+  anchor for it here-->
+  <!--2026-01-31 marja: further improve this page, upload the dx2-configureTimezone.png
+  screenshot-->
+  <mediaobject>
+    <imageobject condition="classical">
+      <imagedata format="PNG" xml:id="configureTimezone-im1" align="center" fileref="dx2-configureTimezone.png" revision="1"/>
+    </imageobject>
+
+    <imageobject condition="live">
+      <imagedata format="png" fileref="live-timeZone.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <itemizedlist>
+    <listitem>
+	    <para xml:id="configureTimezone-pa1" revision="2">Select your
+	    timezone by choosing your country, or a city close to you in the same
+	    timezone.</para>
+    </listitem>
+    <listitem>
+	    <para xml:id="configureTimezone-pa2" revision="2">In the next screen you can
+	    configure your hardware clock and enable time synchronization.</para>
+    </listitem>
+  </itemizedlist>
+
+</section>
diff --git a/docs/docs/stable/installer/en/configureTimezoneUTC.xml b/docs/docs/stable/installer/en/configureTimezoneUTC.xml
index a06ff733..823d9b16 100644
--- a/docs/docs/stable/installer/en/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/en/configureTimezoneUTC.xml
@@ -1,6 +1,6 @@
-<?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" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" 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" xreflabel="Configure Timezone UTC" xml:id="configureTimezoneUTC" version="5.0">
   <info>
-    <title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
+    <title xml:id="configureTimezoneUTC-ti6">Date, Clock and Time Zone Settings</title>
   </info>
 
   <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
@@ -11,31 +11,38 @@
 
   <!--2018/02/25 apb: Added xreflabel to this section.-->
 
+  <!--2026-01-30 marja: Copy this page to new configureTimezone.xml, rewrite this
+  page to better match the traditional installer screen it is about-->
+  <!--2026-02-01 marja: upload the better matching dx2-configureTimezoneUTC-1.png
+  screenshot-->
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata format="PNG" xml:id="configureTimezoneUTC-im1" align="center" fileref="dx2-configureTimezoneUTC.png" revision="1"/>
+      <imagedata format="PNG" xml:id="configureTimezoneUTC-im1" align="center" fileref="dx2-configureTimezoneUTC-1.png" revision="2"/>
     </imageobject>
 
-    <imageobject condition="live">
+    <!--    <imageobject condition="live">
       <imagedata format="png" fileref="live-timeZone.png" align="center"/>
-    </imageobject>
-  </mediaobject>
+    </imageobject> Not needed, there is live-bestTime.png-->
+
+  </mediaobject> 
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your
-      timezone by choosing your country, or a city close to you in the same
-      timezone.</para>
+            <para xml:id="configureTimezoneUTC-pa1" revision="2">In this screen, you
+	    can choose between setting your hardware clock to UTC or to local time.
+            </para>
     </listitem>
-  </itemizedlist>
-
-  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you
-  can choose to set your hardware clock to local time or to GMT, also known as
-  UTC.</para>
+    <listitem>
+	    <para xml:id="configureTimezoneUTC-pa2" revision="2">Something else you
+	    can do here, is to enable automatic time synchronization with NTP. For
+	    that to work, you need to select an NTP server. Choose one that is close
+	    to you.</para>
+    </listitem>
+ </itemizedlist>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than
     one operating system on your computer, make sure they are all set to local
-    time, or all to UTC/GMT.</para>
+    time, or all to UTC.</para>
   </note>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/en/locale.xml b/docs/docs/stable/installer/en/locale.xml
index 6fe8ec40..3b3fd449 100644
--- a/docs/docs/stable/installer/en/locale.xml
+++ b/docs/docs/stable/installer/en/locale.xml
@@ -8,7 +8,7 @@
          xmlns:db="http://docbook.org/ns/docbook">
   <title>Locale</title>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
-
+  <!-- remove selectTimezoneUTC.xml, because setting the timezone is now done
+  at the beginning of the installation-->
   <xi:include href="selectCountry.xml"/>
 </section>
diff --git a/docs/docs/stable/installer/en/misc-params.xml b/docs/docs/stable/installer/en/misc-params.xml
index e204196a..5a6ad5da 100644
--- a/docs/docs/stable/installer/en/misc-params.xml
+++ b/docs/docs/stable/installer/en/misc-params.xml
@@ -15,6 +15,9 @@
 
   <!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
 
+  <!--2026-01-31 marja: Update the item about the time zone, now that the user
+  set it at the beginning of the installation-->
+
   <mediaobject>
     <imageobject>
       <imagedata fileref="dx2-summaryTop.png" align="center"/>
@@ -53,9 +56,9 @@
       <listitem>
         <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a
-        timezone for you, depending on your preferred language. You can change
-        it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
+	<para xml:id="misc-params-system-pa2a" revision="2">If the time settings you chose before 
+	are wrong, you can correct them here. See also <xref linkend="configureTimezone"/> and 
+	<xref linkend="configureTimezoneUTC"/> </para>
       </listitem>
 
       <listitem>
@@ -236,4 +239,4 @@
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>