aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2026-02-01 14:57:49 +0100
committerMarja van Waes <marja@mageia.org>2026-02-01 14:57:49 +0100
commitcc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d (patch)
tree29f005dcb9853c4f8d2c3d02be3d3ff8c33dd28c /docs
parent516a013c389fa1af2372512a35746ff89a521c11 (diff)
downloadtools-cc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d.tar
tools-cc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d.tar.gz
tools-cc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d.tar.bz2
tools-cc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d.tar.xz
tools-cc9655b7fdb13a25c8f2ae4e0bca1472e5aaf81d.zip
Update our reference to Calenco (mga#35088)
Diffstat (limited to 'docs')
-rw-r--r--docs/docs/stable/installer/en/DrakLive-cover.xml7
-rw-r--r--docs/docs/stable/installer/en/DrakLive.xml5
-rw-r--r--docs/docs/stable/installer/en/DrakX-inline.xml4
-rw-r--r--docs/docs/stable/installer/en/DrakX.xml5
4 files changed, 12 insertions, 9 deletions
diff --git a/docs/docs/stable/installer/en/DrakLive-cover.xml b/docs/docs/stable/installer/en/DrakLive-cover.xml
index 4f279db3..39f594c7 100644
--- a/docs/docs/stable/installer/en/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/en/DrakLive-cover.xml
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?><book 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/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DrakLive-installer" version="5.0">
<!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+ <|--2026-02-01 marja: Update the reference to Calenco. Replace the configureTimezoneUTC.xml inclusion with now correct configureTimezone.xml-->
<info>
<title>Installation from LIVE medium</title>
<publisher>
@@ -21,7 +22,7 @@
</mediaobject>
<para>The texts and screenshots in this manual are available under the
CC BY-SA 3.0 license <link ns6: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 ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>This manual was produced with the help of the <link ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>It was written by volunteers in their free time. Please contact
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
Team</link>, if you would like to help improve this manual.</para>
@@ -36,7 +37,7 @@
<xi:include href="bootLive.xml"/>
<xi:include href="selectLanguage.xml"/>
<xi:include href="acceptLicense.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="configureTimezone.xml"/>
<xi:include href="bestTime.xml"/>
<xi:include href="selectKeyboardLive.xml"/>
<xi:include href="testing.xml"/>
@@ -58,4 +59,4 @@
<xi:include href="login.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
</article>
-</book> \ No newline at end of file
+</book>
diff --git a/docs/docs/stable/installer/en/DrakLive.xml b/docs/docs/stable/installer/en/DrakLive.xml
index 356e9c39..1df72476 100644
--- a/docs/docs/stable/installer/en/DrakLive.xml
+++ b/docs/docs/stable/installer/en/DrakLive.xml
@@ -14,7 +14,7 @@ b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdr
<!--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)-->
-
+ <!--2026-02-01 marja: update the reference to Calenco-->
<info>
<title>Installation from LIVE medium</title>
@@ -30,8 +30,7 @@ b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdr
ns6: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
- ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
- ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>It was written by volunteers in their free time. Please contact
the <link
diff --git a/docs/docs/stable/installer/en/DrakX-inline.xml b/docs/docs/stable/installer/en/DrakX-inline.xml
index 4bbcbadd..e6b44757 100644
--- a/docs/docs/stable/installer/en/DrakX-inline.xml
+++ b/docs/docs/stable/installer/en/DrakX-inline.xml
@@ -12,7 +12,7 @@
<para xml:id="CC_BY-SA">The texts and screenshots in this manual are
available under the CC BY-SA 3.0 license <link ns6: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 ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>This manual was produced with the help of the <link ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>It was written by volunteers in their free time. Please contact
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
@@ -34,6 +34,8 @@
<!--2026-01-31 and 2026-02-01 add configureTimezone.xml before configureTimezoneUTC.xml and move both to immediately after selectInstallClass.xml, see mga#34909-->
+ <!--2026-02-01 update our reference to Calenco-->
+
<!-- <xi:include href="drakx-intro.xml"/> -->
<xi:include href="SelectAndUseISOs2.xml"/>
diff --git a/docs/docs/stable/installer/en/DrakX.xml b/docs/docs/stable/installer/en/DrakX.xml
index 2ddd03a1..30b2992b 100644
--- a/docs/docs/stable/installer/en/DrakX.xml
+++ b/docs/docs/stable/installer/en/DrakX.xml
@@ -36,6 +36,8 @@
<!--2026-01-31 and 2026-02-01 marja: include configureTimezone.xml and configureTimezoneUTC.xml
after selectInstallClass.xml, because that is where they now first appear in the installer.
Include selectCountry.xml instead of locale.xml, because it was the only inclusion left in locale.-->
+
+ <!--2026-02-01 marja: update our reference to Calenco-->
<info>
@@ -53,8 +55,7 @@
ns6: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
- ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
- ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>It was written by volunteers in their free time. Please contact
<link