aboutsummaryrefslogtreecommitdiffstats
path: root/en/support
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2019-06-30 14:54:24 +0200
committerManuel Hiebel <leuhmanu@mageia.org>2019-06-30 14:54:24 +0200
commit4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63 (patch)
tree6c62696036add5efb69318196c245ea184ad34d8 /en/support
parent63c8a1f732efe8b90b4a675a5b0906f4e17d01fb (diff)
downloadwww-4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63.tar
www-4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63.tar.gz
www-4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63.tar.bz2
www-4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63.tar.xz
www-4c5a13e7fe530ad856e544d40fa91d8c8b5d1a63.zip
update for mga7
Diffstat (limited to 'en/support')
-rwxr-xr-x[-rw-r--r--]en/support/index.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/en/support/index.php b/en/support/index.php
index 41a092209..942160ed6 100644..100755
--- 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/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('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>';
@@ -49,7 +49,8 @@ $dictionary = read_translation_file($locale, array('support', 'common_footer'));
_g('Lifecycle', null, 'h3 id="lifecycle"');
_g('Mageia releases are supported at least for 18 months.', null, 'p');
echo '<ul class="hl">';
- _g('Mageia 6 will be supported until about 3 months after Mageia 7 is released.', null, 'li'); // _g('Mageia 6 was supported until January 16th, 2019.', null, 'li');
+ _g('Mageia 7 will be supported until December 30th, 2020.', null, 'li');
+ _g('Mageia 6 will be supported until September 30th, 2019.', null, 'li'); // _g('Mageia 6 was supported until September 30th, 2019.', null, 'li');
echo '<li>';
_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.',