aboutsummaryrefslogtreecommitdiffstats
path: root/en/support
diff options
context:
space:
mode:
Diffstat (limited to 'en/support')
-rw-r--r--en/support/index.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/en/support/index.php b/en/support/index.php
index 36055f7ab..18a52c99e 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/4.html">Mageia 4</a>', '<a href="//advisories.mageia.org/5.html">Mageia 5</a>'), 'p');
- _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/5.html">Mageia 5</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/5.html">Mageia 5</a>', '<a href="//advisories.mageia.org/6.html">Mageia 6</a>'), 'p');
+ _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</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>';
@@ -51,11 +51,11 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer'));
echo '<ul class="hl">';
_g('Mageia 6 will be supported until January 16th, 2019.', null, 'li'); // _g('Mageia 6 was supported until January 16th, 2019.', null, 'li');
echo '<li>';
- _g('Mageia 5 EOL is postponed until December 31st, 2017.', null, ' ');
+ _g('Mageia 5 was supported until December 31st, 2017.', null, ' ');
_g('More details and advice are available on our %swiki page%s and from %sour blog%s.',
array('<a href="' . _r('https://wiki.mageia.org/en/From_Mageia_5_to_6') . '">', '</a>',
'<a href="' . _r('https://blog.mageia.org/en/2017/11/07/mageia-5-eol-postponed/') . '">', '</a>'));
- // _g('Mageia 5 was supported until December 31st, 2017.', null, 'li');
+
echo '</li>';
_g('Mageia 4 was supported until September 19th, 2015.', null, 'li');
_g('Mageia 3 was supported until November 26th, 2014.', null, 'li');