[gnomeweb-wml/support] NetworkManager: Added details about distribution and upstream help to support page

[Martyn James Russell <mr src gnome org>]

commit 515d5328c7bc1637e1382e987cffb6686080995b
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jun 1 13:50:12 2012 +0100

    NetworkManager: Added details about distribution and upstream help to support page

 .../NetworkManager/support/index.html              |  107 +++++++++++---------
 1 files changed, 60 insertions(+), 47 deletions(-)
---
diff --git a/projects.gnome.org/NetworkManager/support/index.html b/projects.gnome.org/NetworkManager/support/index.html
index 08c53c4..34f30ef 100644
--- a/projects.gnome.org/NetworkManager/support/index.html
+++ b/projects.gnome.org/NetworkManager/support/index.html
@@ -16,56 +16,69 @@
 		</div>
 	</div>
 
-<h2><a name="GetSupportFor">Get Assistance</a></h2>
-<p>NetworkManager and ModemManager are supported by a number of businesses and they provide services, experience and skills to help the large community of users and vendors produce innovative customer solutions in multiple industries and devices (like mobile and embedded).</p>
-
-<p>Consultancy partners which support NetworkManager and ModemManager offer a range of business services including:</p>
-<ul>
-	<li><a href="#Consultation">Consultation</a></li>
-	<li><a href="#HardwareIntegration">Hardware integration</a></li>
-	<li><a href="#Porting">Porting</a></li>
-	<li><a href="#BackFolding">Patch set back folding</a></li>
-	<li><a href="#Training">Training</a></li>
-</ul>
-
-<h3>Consultancy Partners</h3>
-
-<table>
-	<tr>
-	  <th>Companies</th>
-	  <th>Websites</th>
-	</tr>
-
-	<tr>
-	  <td>RedHat</td>
-	  <td><a href="http://www.redhat.com/support";>http://www.redhat.com/support</a></td>
-	</tr>
-	<tr>
-	  <td>Lanedo GmbH</td>
-	  <td><a href="http://www.lanedo.com/networkmanager.html";>http://www.lanedo.com/networkmanager.html</a></td>
-	</tr>
-
-<tr><td colspan="2"><div id="note">Not listed above? Want to be? Contact the <a href="http://mail.gnome.org/mailman/listinfo/networkmanager-list";>mailing list</a>.</div></td></tr>
-</table>
-
-<h3><a name="Consultation">Consultation</a></h3>
-<p>Perhaps your business is looking for consultancy around using NetworkManager and ModemManager. If this is what you&apos;re looking for, our consultancy partners affilliated with the project can offer these services. This can range from development, to support, to even queries about licensing and how to integrate the toolkit into your existing solutions and much more!</p>
-
-<h3><a name="HardwareIntegration">Hardware Integration</a></h3>
-<p>With changes happening all the time in hardware, NetworkManager and ModemManager are constantly adapting to the requests for newer and richer technology and features. One great example of this is 2G, 3G and now 4G. Businesses invested in NetworkManager and ModemManager have been at the forefront of implementing this hardware support and working with other projects up and down the Linux stack to make that happen.</p>
-
-<h3><a name="Porting">Porting</a></h3>
-<p>Porting can cover a range of areas. Perhaps you need help porting NetworkManager/ModemManager to a Linux platform which is lacking support. Or perhaps you have a driver for another operating system but need help porting it to Linux to enable your hardware?</p>
-
-<h3><a name="BackFolding">Patch Set Back-Folding</a></h3>
-<p>It&apos;s not uncommon for companies to start forking a project to customize it and perhaps to keep it in-house. This can lead to wanting new features from an upstream project like NetworkManager being available in your forked version. If you need help back-folding patch sets into upstream or suggesting new features into the main stream, we have a support network that can help you do that.</p>
-
-<h3><a name="Training">Training</a></h3>
-<p>There are various training opportunities on offer. Everything from writing an application with NetworkManager to developing and customizing NetworkManager or ModemManager. If this is what you&apos;re looking for, there are businesses out there that can help you do that.</p>
+	<div class="float-right">
+		<div id="sidebar">
+			<h3>Distribution Issues</h3>
+			<p>If you're using a Linux distribution, it's best to file bugs with their bug trackers first. This usually trickles down to the underlying project or may have already been fixed or reported for the distribution but not released yet.</p>
+
+			<h3>Upstream Bugs/Features</h3>
+			<p>If your distribution suggests filing a bug upstream, you can do so using the <a href="https://bugzilla.gnome.org/browse.cgi?product=NetworkManager";>NetworkManager bugzilla</a>. For questions or queries about this, contact the maintainers on IRC (#nm on freenode) or the <a href="http://mail.gnome.org/mailman/listinfo/networkmanager-list";>mailing list</a>.</p>
+
+			<h3>Professional Support</h3>
+			<p>NetworkManager is a volunteer-run project, but if you want a larger feature, hardware enablement, or a bug fix more quickly than the volunteer upstream developers can provide it, then the consulting options on this page are available.</p>
+		</div>
+	</div>
+
+	<h2><a name="GetSupportFor">Get Assistance</a></h2>
+	<p>NetworkManager and ModemManager are supported by a number of businesses and they provide services, experience and skills to help the large community of users and vendors produce innovative customer solutions in multiple industries and devices (like mobile and embedded).</p>
+
+	<p>Consultancy partners which support NetworkManager and ModemManager offer a range of business services including:</p>
+	<ul>
+	  <li><a href="#Consultation">Consultation</a></li>
+	  <li><a href="#HardwareIntegration">Hardware integration</a></li>
+	  <li><a href="#Porting">Porting</a></li>
+	  <li><a href="#BackFolding">Patch set back folding</a></li>
+	  <li><a href="#Training">Training</a></li>
+	</ul>
+
+	<h3>Consultancy Partners</h3>
+
+	<table>
+	  <tr>
+	    <th>Companies</th>
+	    <th>Websites</th>
+	  </tr>
+
+	  <tr>
+	    <td>RedHat</td>
+	    <td><a href="http://www.redhat.com/support";>http://www.redhat.com/support</a></td>
+	  </tr>
+	  <tr>
+	    <td>Lanedo</td>
+	    <td><a href="http://www.lanedo.com/networkmanager.html";>http://www.lanedo.com/networkmanager</a></td>
+	  </tr>
+
+	  <tr><td colspan="2"><div id="note">Not listed above? Want to be? Contact the <a href="http://mail.gnome.org/mailman/listinfo/networkmanager-list";>mailing list</a>.</div></td></tr>
+	</table>
+
+	<h3><a name="Consultation">Consultation</a></h3>
+	<p>Perhaps your business is looking for consultancy around using NetworkManager and ModemManager. If this is what you&apos;re looking for, our consultancy partners affilliated with the project can offer these services. This can range from development, to support, to even queries about licensing and how to integrate the toolkit into your existing solutions and much more!</p>
+
+	<h3><a name="HardwareIntegration">Hardware Integration</a></h3>
+	<p>With changes happening all the time in hardware, NetworkManager and ModemManager are constantly adapting to the requests for newer and richer technology and features. One great example of this is 2G, 3G and now 4G. Businesses invested in NetworkManager and ModemManager have been at the forefront of implementing this hardware support and working with other projects up and down the Linux stack to make that happen.</p>
+
+	<h3><a name="Porting">Porting</a></h3>
+	<p>Porting can cover a range of areas. Perhaps you need help porting NetworkManager/ModemManager to a Linux platform which is lacking support. Or perhaps you have a driver for another operating system but need help porting it to Linux to enable your hardware?</p>
+
+	<h3><a name="BackFolding">Patch Set Back-Folding</a></h3>
+	<p>It&apos;s not uncommon for companies to start forking a project to customize it and perhaps to keep it in-house. This can lead to wanting new features from an upstream project like NetworkManager being available in your forked version. If you need help back-folding patch sets into upstream or suggesting new features into the main stream, we have a support network that can help you do that.</p>
+
+	<h3><a name="Training">Training</a></h3>
+	<p>There are various training opportunities on offer. Everything from writing an application with NetworkManager to developing and customizing NetworkManager or ModemManager. If this is what you&apos;re looking for, there are businesses out there that can help you do that.</p>
 </div>
 
 <div id="copyright">
-	<p>NetworkManager is distributed under the GNU General Public License v.2, and is Copyright &copy; 2004-2011 by <a href="http://www.redhat.com/";>Red Hat, Inc.</a>, Copyright &copy; 2006-2008 by <a href="http://www.novell.com/";>Novell, Inc.</a> and many others.</p>
+  <p>NetworkManager is distributed under the GNU General Public License v.2, and is Copyright &copy; 2004-2011 by <a href="http://www.redhat.com/";>Red Hat, Inc.</a>, Copyright &copy; 2006-2008 by <a href="http://www.novell.com/";>Novell, Inc.</a> and many others.</p>
 </div>
 </body>
 </html>