Jeremy Newman : cleanup and reorg english forums/ml page

[Alexandre Julliard]

Module: website
Branch: master
Commit: f4a98f1b077da3ef6d5a1e1a8f632e66dcf97480
URL:    https://gitlab.winehq.org/winehq/winehq/-/commit/f4a98f1b077da3ef6d5a1e1a8f6...

Author: Jeremy Newman 
Date:   Tue Jul 12 14:30:38 2022 -0500

cleanup and reorg english forums/ml page

---

templates/en/forums.template | 59 ++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/templates/en/forums.template b/templates/en/forums.template
index f0b55ad9..648a35ee 100644
--- a/templates/en/forums.template
+++ b/templates/en/forums.template
@@ -1,42 +1,40 @@
-<!--TITLE:[Mailing Lists / Forums]-->
+<!--TITLE:[Forums and Mailing Lists]-->

-<h1 class="title">Key Mailing Lists / Forums</h1>
+<h1 class="title">Forums and Mailing Lists</h1>

-<p>Wine has many mailing lists and forums.
-Here are the most useful ones for users:</p>
+<h2>WineHQ Forums</h2>

-<ul>
-    <li>The <a href="//forum.winehq.org">WineHQ Forums</a></li>
+<p>Wine has many mailing lists and forums. Here are the most useful ones for users:</p>

-    <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a>
+<ul class="roomy">

-    <li>If you want to be notified about new releases, subscribe to the <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li>
-</ul>
+    <li><a href="https://forum.winehq.org">WineHQ Forums</a></li>
+
+    <li><a href="https://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a>

-<p>Please don't create another English language Wine forum (except perhaps
-a Wine area in a popular distro's main forum).</p>
+</ul>

<p>If you know of another active Wine forum - especially a non-English one
-- please let us know so we can add it to the list.
-(Email to [e-mail] would do.)</p>
+- please <a href="mailto:[e-mail]">let us know</a> so we can add it to the list.</p>
+
+<p class="text-muted"><i class="fa fa-info-circle"></i> If you only want to be notified about new releases, subscribe to the <a href="https://www.winehq.org/mailman3/postorius/lists/wine-announce.winehq.org/">Wine-Announce</a> mailing list</p>
+
+<h2>WineHQ Mailing Lists</h2>

-<h2>All WineHQ Mailing Lists</h2>
+<p>WineHQ has mailing lists for submitting patches, tracking Git commits, and discussing Wine development.</p>

-<p>WineHQ has mailing lists for submitting patches, tracking Git
-commits, and discussing Wine. They feature a very customizable user
-subscription config, and can be managed via
-<a href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">the Mailman web interface</a>.</p>
+<p class="text-muted"><i class="fa fa-info-circle"></i> You need to subscribe to the lists before you can post
+to them, otherwise your posting will be discarded.<br>
+You can set your subscription to not send you email, or send as a digest.</p>

-<p><b>Note:</b> You should be subscribed to the lists before you post
-to them, otherwise your posting will be treated as possible spam by the
-mailing list software.</p>
+<h3>User Mailing Lists</h3>

<ul class="roomy">

<li>
     <b><a href="mailto:[e-mail]">[e-mail]</a></b><br>
     [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-announce.winehq.org/">(Un-)Subscribe</a>]
-    [<a href="https://www.winehq.org/mailman3/hyperkitty/list/[e-mail]/">Archive</a>]
+    [<a href="https://www.winehq.org/mailman3/hyperkitty/list/[e-mail]/">Archive</a>]<br>
     A low traffic (2/month) read-only list for announcing releases
     and other major Wine or WineHQ news.
   </li>
@@ -48,24 +46,31 @@ mailing list software.</p>
     A low traffic (10/day) open list for end-user discussions in Chinese.
   </li>

+</ul>
+
+<h3>Developer Mailing Lists</h3>
+
+<ul class="roomy">
+
   <li>
     <b><a href="mailto:[e-mail]">[e-mail]</a></b><br>
     [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>]
-    [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>]
+    [<a href="//www.winehq.org/pipermail/wine-devel/">Archive</a>]<br>
     A medium traffic (50/day) open list for discussing Wine development,
     WineHQ, patches or anything else of interest to Wine developers.
   </li>

<li>
     <b><a href="mailto:[e-mail]">[e-mail]</a></b><br>
-    [<a href="https://www.winehq.org/mailman3/hyperkitty/list/[e-mail]/">Archive 1</a>]
+    [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-gitlab.winehq.org/">(Un-)Subscribe</a>]
+    [<a href="https://www.winehq.org/mailman3/hyperkitty/list/[e-mail]/">Archive</a>]<br>
     A medium traffic (50/day) read only list for patches and merge requests from <a href="https://gitlab.winehq.org/">Wine Gitlab</a>.
   </li>

<li>
     <b><a href="mailto:[e-mail]">[e-mail]</a></b><br>
     [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>]
-    [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>]
+    [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive</a>]<br>
     A medium traffic (25/day) read only list which tracks commits to the Git
     tree.
   </li>
@@ -81,9 +86,9 @@ mailing list software.</p>
   <li>
     <b><a href="mailto:[e-mail]">[e-mail]</a></b><br>
     [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>]
-    [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>]
+    [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>]<br>
     A high traffic (100/day) read-only list for monitoring activity on the
-    <a href="//bugs.winehq.org/">Bug Tracking Database</a>.
+    <a href="https://bugs.winehq.org/">Bug Tracking Database</a>.
   </li>

</ul>