aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2020-05-20 18:38:51 +0200
committerfilip <filip.komar@gmail.com>2020-05-20 18:38:51 +0200
commitfc9cbeb6d1653c0ee6ddb8561fe10e18cf88b943 (patch)
tree1b1583ddb3be3424bd55aea2ab40638be01822c9
parent321e4fe41731657b30a8cfad73a56300132415e5 (diff)
fixed some leftovers for mga6 support
-rw-r--r--en/doc/archive.php16
-rw-r--r--en/doc/index.php15
-rw-r--r--en/support/index.php4
3 files changed, 18 insertions, 17 deletions
diff --git a/en/doc/archive.php b/en/doc/archive.php
index 2211eaf52..c80abf8d1 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -27,6 +27,22 @@ require 'doc.php';
<?php _g('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p>
<?php _g('Documentation built using the <a href="%s">Calenco tool from NeoDoc</a>.', 'http://www.neodoc.biz/', 'p')?>
<hr>
+ <h3>Mageia 6</h3>
+ <div class="row">
+ <div class="col">
+ <?php doc_list(_r('Installer'), 'installer', 6); ?>
+ </div>
+ <div class="col">
+ <?php doc_list(_r('Control Center'), 'control_center', 6); ?>
+ </div>
+ <div class="col">
+ <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 6); ?>
+ </div>
+ <div class="col">
+ <?php doc_list(_r('Network installation'), 'netinstall', 6); ?>
+ </div>
+ </div>
+ <hr>
<h3>Mageia 5</h3>
<div class="row">
<div class="col">
diff --git a/en/doc/index.php b/en/doc/index.php
index b25beeaad..38e381c7d 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -47,21 +47,6 @@ require 'doc.php';
</div>
</div>
<hr>
- <h3>Mageia 6</h3>
- <div class="row">
- <div class="col">
- <?php doc_list(_r('Installer'), 'installer', 6); ?>
- </div>
- <div class="col">
- <?php doc_list(_r('Control Center'), 'control_center', 6); ?>
- </div>
- <div class="col">
- <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 6); ?>
- </div>
- <div class="col">
- <?php doc_list(_r('Network installation'), 'netinstall', 6); ?>
- </div>
- </div>
</div>
</div>
</div>
diff --git a/en/support/index.php b/en/support/index.php
index b108d476b..9ee009a50 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -40,8 +40,8 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer'));
'<a href="' . _r('https://wiki.mageia.org') . '">', '</a>'), 'p');
echo '<hr>';
_g('Updates', null, 'h2 id="updates"');
- _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</a>', '<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p');
-// _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p');
+// _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</a>', '<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p');
+ _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p');
_g('You can install these from the Mageia Control Center.', null, 'p');
_g('You may subscribe to our %s announce list to be notified of these.', array('<a href="https://ml.mageia.org/l/info/updates-announce">updates-announce</a>'), 'p');
echo '<hr>';