aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-04-14 15:33:50 +0000
committerNicolas Vigier <boklm@mageia.org>2013-04-14 15:33:50 +0000
commit9b05c55eadca65b108008725165c05f422b26c4b (patch)
tree797af009e7b3551c301b948663f241dc0f70adfb
parentabfcd326e803519d7f8d8c117a164f4a30ed1611 (diff)
downloadwww-9b05c55eadca65b108008725165c05f422b26c4b.tar
www-9b05c55eadca65b108008725165c05f422b26c4b.tar.gz
www-9b05c55eadca65b108008725165c05f422b26c4b.tar.bz2
www-9b05c55eadca65b108008725165c05f422b26c4b.tar.xz
www-9b05c55eadca65b108008725165c05f422b26c4b.zip
Update mailing lists links
-rw-r--r--en/community/index.php4
-rw-r--r--en/contact/index.php6
-rw-r--r--en/contribute/index.php2
-rw-r--r--en/downloads/get/index.php2
-rw-r--r--en/map/index.php4
-rw-r--r--en/support/index.php2
6 files changed, 10 insertions, 10 deletions
diff --git a/en/community/index.php b/en/community/index.php
index f31e885dc..e4ebbc352 100644
--- a/en/community/index.php
+++ b/en/community/index.php
@@ -100,7 +100,7 @@ include '../../lib/news.php';
<p><?php _e('... or, how to get in touch with us? Easy:')?></p>
<ul class="hl">
<li><a href="https://wiki.mageia.org/en/IRC" title="Internet Relay Chat"><?php echo _d('IRC</a> on Freenode')?>,</li>
- <li><a href="/mailman/"><?php echo _d('mailing-lists 1</a> &amp; <a href="http://ml.mageia.org/">2')?></a>,</li>
+ <li><a href="https://wiki.mageia.org/en/Mailing_lists"><?php echo _d('mailing-lists')?></a>,</li>
<li><a href="<?php _e('https://forum.mageia.org/en/')?>"><?php echo _d('Forum')?></a>,</li>
<li><a href="<?php _e('http://blog.mageia.org/en/')?>"><?php echo _d('Blog')?></a>,</li>
<li><?php _e('in real life!')?></li>
@@ -143,4 +143,4 @@ include '../../lib/news.php';
<p style="clear: both; text-align: right;"><mark><?php _e('This page needs you! <a href="https://wiki.mageia.org/en/Web_team">Join the Web team</a>!')?></mark></p>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/en/contact/index.php b/en/contact/index.php
index d639567b2..e0d86b195 100644
--- a/en/contact/index.php
+++ b/en/contact/index.php
@@ -53,7 +53,7 @@ _lang_load($locale, 'contact');
<?php
_h('You have an idea of who to contact', null, 'h2');
_h('You may post in the <a href="%s">forum</a> or the <a href="%s">public discussion mailing-list</a>.',
- array('https://forums.mageia.org/', 'https://www.mageia.org/mailman/listinfo/mageia-discuss'));
+ array('https://forums.mageia.org/', 'https://ml.mageia.org/l/info/discuss'));
_h('You also may use the following email aliases too to contact all members of a group at once:');
$groups = array(
'board' => _d('Mageia.Org Board members'),
@@ -72,8 +72,8 @@ _lang_load($locale, 'contact');
echo '</ul>';
_h(
- 'In most case you should avoid using those aliases as they should only be used for the rare cases where private emails are needed. Use appropriate public mailing list on <a href="%s">either</a> of <a href="%s">two</a> pages instead.',
- array('https://www.mageia.org/mailman/', 'http://ml.mageia.org/')
+ 'In most case you should avoid using those aliases as they should only be used for the rare cases where private emails are needed. Use appropriate <a href="%s">public mailing list</a> instead.',
+ array('https://wiki.mageia.org/en/Mailing_lists')
);
_h('If you want to contact Council or Board for a public discussion, you can start a thread on a mailing-list and add the Board or Council alias in CC.');
echo '<hr>';
diff --git a/en/contribute/index.php b/en/contribute/index.php
index 6e2b0a52b..4254e67d2 100644
--- a/en/contribute/index.php
+++ b/en/contribute/index.php
@@ -64,7 +64,7 @@ _lang_load($locale, 'contribute');
<ul id="contrib-roles" class="contrib-list">
<li id="support">
<h3><?php _e('Helping users &amp; advocating the project')?></h3>
- <p><?php _e('Want to welcome and help new users or share tips with experienced ones? In <a href="https://wiki.mageia.org/en/IRC">IRC channels</a>, <a href="http://forums.mageia.org/">forums</a>, <a href="http://mageia.org/mailman/">mailing-lists</a>, local events? Just get in touch with us via one of these channels and share the fun!')?></p>
+ <p><?php _e('Want to welcome and help new users or share tips with experienced ones? In <a href="https://wiki.mageia.org/en/IRC">IRC channels</a>, <a href="http://forums.mageia.org/">forums</a>, <a href="https://wiki.mageia.org/en/Mailing_lists">mailing-lists</a>, local events? Just get in touch with us via one of these channels and share the fun!')?></p>
</li>
<li id="docu">
<h3><a href="https://wiki.mageia.org/en/Documentation_team"><?php _e('Writing, copywriting and documenting')?></a></h3>
diff --git a/en/downloads/get/index.php b/en/downloads/get/index.php
index 56bdf14ca..465f1bc34 100644
--- a/en/downloads/get/index.php
+++ b/en/downloads/get/index.php
@@ -236,7 +236,7 @@ if (!isset($_ENV['APP_MODE']) || $_ENV['APP_MODE'] == 'prod') {
<ul>
<li><?php _e('directly on <a href="irc://irc.freenode.net/#mageia-web">#mageia-web on Freenode IRC</a>,'); ?></li>
<li><?php _e('or <a href="http://twitter.com/mageia_org">via our Tweeter account</a>,'); ?></li>
- <li><?php _e('or with a <a href="https://www.mageia.org/mailman/listinfo/mageia-webteam">notice on the Web team mailing-list</a>,'); ?></li>
+ <li><?php _e('or with a <a href="https://ml.mageia.org/l/info/atelier-discuss">notice on the Atelier team mailing-list</a>,'); ?></li>
<li><?php _e('or a <a href="https://bugs.mageia.org/enter_bug.cgi?product=Websites&format=guided&component=www.mageia.org">bug report</a>.'); ?></li>
</ul>
diff --git a/en/map/index.php b/en/map/index.php
index 3a0cf896f..bfb6959f2 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -63,7 +63,7 @@ $map = array(
array('t' => _t('Planet'), 'l' => _d('http://planet.mageia.org/en/')),
array('t' => _t('Blog'), 'l' => _d('http://blog.mageia.org/en/')),
array('t' => _t('Calendar'), 'l' => '/{L}/calendar/'),
- array('t' => _t('Mailing-lists'), 'l' => 'http://www.mageia.org/mailman/'),
+ array('t' => _t('Mailing-lists'), 'l' => 'https://wiki.mageia.org/en/Mailing_lists'),
array('t' => _t('Mailing-lists'), 'l' => 'http://ml.mageia.org/'),
array('t' => 'IRC', 'l' => 'http://wiki.mageia.org/en/IRC'),
array('t' => _t('Forums'), 'l' => _d('http://forums.mageia.org/')),
@@ -141,4 +141,4 @@ $sMap .= '</ul>';
-->
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/en/support/index.php b/en/support/index.php
index a1a7a0bbd..6832ae930 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -61,7 +61,7 @@ _lang_load($locale, 'support');
_h('<a href="http://forums.mageia.org/en/">Community support forums</a> in English &ndash; see <a href="https://forums.mageia.org/en/viewforum.php?f=20">other Mageia community forums</a> for support in your language;', null, 'li');
_h('IRC channels where you can discuss live with other Mageia users and contributors: <a href="irc://irc.freenode.net/#mageia" hreflang="en">#mageia</a> or other localized <a href="https://wiki.mageia.org/en/IRC#channels_in_other_languages">channels</a>;', null, 'li');
_h('our <a href="https://wiki.mageia.org/en/">Wiki</a> (still rough at the time, we are working on it!);', null, 'li');
- _h('our <a href="http://www.mageia.org/mailman/" hreflang="en">mailing-lists</a>;', null, 'li');
+ _h('our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;', null, 'li');
_h('local events: follow our <a href="http://blog.mageia.org/en/">blog</a> and <a href="http://www.mageia.org/en/calendar/">calendar</a>.', null, 'li');
echo '</ul>';
echo '<hr>';