Jeremy Newman : forums and mailing list are seperate. misc html cleanup

[Jeremy Newman]

Module: website
Branch: master
Commit: 6f63d9ca396655fb060dc958f76c4643624e8e83
URL:    http://source.winehq.org/git/website.git/?a=commit;h=6f63d9ca396655fb060dc95...

Author: Jeremy Newman <jnewman(a)codeweavers.com>
Date:   Tue Jul 10 09:15:41 2012 -0500

forums and mailing list are seperate. misc html cleanup

---

 templates/en/forums.template |   48 +++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/templates/en/forums.template b/templates/en/forums.template
index 6ce73ec..6b00e99 100644
--- a/templates/en/forums.template
+++ b/templates/en/forums.template
@@ -7,24 +7,23 @@
 Here are the most useful ones for users:</p>
 
 <ul>
-    <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support</li>
+    <li>The <a href="http://forum.winehq.org">WineHQ Forums</a></li>
 
-    <li>The <a href="http://forum.winehq.org">WineHQ Forums</a> - for those of you that prefer a forum interface over mailing lists. The mailing lists and forum are interlinked. Messages sent to one automatically propagate to the other.</li>
+    <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>)</li>
 
     <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a>
 
     <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a>
 
     <li>If you want to be notified about new releases, subscribe to the <a href="http://www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li>
-
 </ul>
-Please don't create another English language Wine forum (except perhaps 
-a Wine area in a popular distro's main forum).
-<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 dank(a)kegel.com would do.)
 
+<p>Please don't create another English language Wine forum (except perhaps 
+a Wine area in a popular distro's main forum).</p>
+
+<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 dank(a)kegel.com would do.)</p>
 
 <h2>All WineHQ Mailing Lists</h2>
 
@@ -40,7 +39,7 @@ or just use <a href="http://www.winehq.org/mailman/listinfo">the Mailman web int
 to them, otherwise your posting will be treated as possible spam by the
 mailing list software.</p>
 
-<ul>
+<ul class="roomy">
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-announce">(Un-)Subscribe</a>] 
     [<a href="http://www.winehq.org/pipermail/wine-announce/">Archive 1</a>] 
@@ -48,16 +47,17 @@ mailing list software.</p>
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>]
     <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a><br>
     A low traffic (2/month) read-only list for announcing releases
-    and other major Wine or WineHQ news.<br><br>
+    and other major Wine or WineHQ news.
+  </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-users">(Un-)Subscribe</a>]
     [<a href="http://www.winehq.org/pipermail/wine-users/">Archive 1</a>]  
     [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>]
-    [<a href="http://forum.winehq.org">via web forums</a>]
     <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a><br>
-    A medium traffic (50/day) open list for end-user discussions.<br><br>
+    A medium traffic (50/day) open list for end-user discussions.
+  </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>]
@@ -66,7 +66,8 @@ mailing list software.</p>
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>]
     <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> <br>
     A medium traffic (25/day) open list for discussing Wine development,
-    WineHQ, patches or anything else of interest to Wine developers.<br><br>
+    WineHQ, patches or anything else of interest to Wine developers.
+  </li>
 
   <li>
    [<a href="http://www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>]
@@ -74,7 +75,8 @@ mailing list software.</p>
    [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>]
    <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a><br>
-   A medium traffic (45/day) open list for submitting patches only.<br><br>
+   A medium traffic (45/day) open list for submitting patches only.
+ </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>]
@@ -83,21 +85,24 @@ mailing list software.</p>
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>]
     <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a><br>
     A medium traffic (35/day) read only list which tracks commits to the Git
-    tree.<br><br>
+    tree.
+  </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-releases">(Un-)Subscribe</a>]
     [<a href="http://www.winehq.org/pipermail/wine-releases/">Archive 1</a>]
     <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> <br>
     A low traffic (2/month) read only list for receiving a large diff file
-    at every Wine official release.<br><br>
+    at every Wine official release.
+  </li>
 
   <li>
     [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">Archive 1</a>]
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>]
     <br>
     Closed list that was for discussing legal issues
-    related to Wine, including license issues. (Closed 2004-12-16)<br><br>
+    related to Wine, including license issues. (Closed 2004-12-16)
+  </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>]
@@ -106,13 +111,14 @@ mailing list software.</p>
     [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>]
     <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a><br>
     A high traffic (150/day) read-only list for monitoring activity on the
-    <a href="http://bugs.winehq.org/">Bug Tracking Database</a>.<br><br>
+    <a href="http://bugs.winehq.org/">Bug Tracking Database</a>.
+  </li>
 
   <li>
     [<a href="http://www.winehq.org/mailman/listinfo/wine-tests-results">(Un-)Subscribe</a>]
     [<a href="http://www.winehq.org/pipermail/wine-tests-results/">Archive</a>]
     <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a><br>
     A medium traffic (10/day) open list for submitting test results.
-</ul>
+  </li>
 
-<p> </p>
+</ul>