multiple updates addressing issue #108, #141, #136 and #142

commotionwireless.net/css/commotion.css

@@ -1,3 +1,7 @@
+body {
+  font-family: AsapRegular;
+  src: url(fonts/Asap-Regular-webfont.ttf);
+}
 /* top bar */
 .navbar-inners {
   height: 20px;

commotionwireless.net/docs/get-started/index.md

@@ -39,11 +39,27 @@ Community networks are built by a coalition of community anchor institutions, co
   <li>Municipal governments</li>
 </ul>
 
-  <h2>Connect with Others</h2>
+<h2>Connect with Others</h2>
 
 <p>Mesh networking begins with people. Work with your community to determine communication needs, interests, and willingness to participate and help. Start with conversations or meetings about how your group could use mesh networking. For help, see the <a href="/docs/cck/planning"><em>Planning</em> modules</a> in the <a href="/docs/cck">Commotion Construction Kit</a>. We also encourage you to <a href="/about/faq">read our frequently asked questions.</a><br />
 <img src="/files/styles/large/public/title_image.png?itok=uhJC0pqH" /></p>
 
+<h2>Connect with the Commotion community</h2>
+
+<p>Use our "<a href="/contact">Contact</a>" or "<a href="/report">Report a Bug</a>" forms on this website.</p>
+
+<p>Subscribe to one or more of our listservs:</p>
+
+<ul>
+	<li><a href="https://lists.chambana.net/mailman/listinfo/commotion-announce">commotion-announce</a>: only official announcements with minimal discussion</li>
+	<li><a href="https://lists.chambana.net/mailman/listinfo/commotion-discuss">commotion-discuss</a>: for those who want to use Commotion without getting too technical</li>
+	<li><a href="https://lists.chambana.net/mailman/listinfo/commotion-dev">commotion-dev</a>: for those who want to discuss improvements the Commotion software</li>
+</ul>
+
+<p>You can also join us using your chat program on IRC in the #commotion channel on the irc.freenode.net server.</p>
+
+<p>Learn more about <a href="http://freenode.net/using_the_network.shtml" target="_blank">using IRC</a>.</p>
+
 <h2>Choose your devices</h2>
 
 <p>Commotion can be used on a variety of devices. Depending on your community’s needs, you need to select the hardware that will form your network. The network can be made up of cell phones, computers, and routers. Review our <a href="/docs/supported-devices">Supported Devices</a> to get started.</p>

commotionwireless.net/docs/supported-devices/index.md

@@ -10,7 +10,7 @@ lang: en
 ---
   <p>Commotion is supported on a variety of devices and platforms. We list devices as "supported" after active testing on the latest release of our software. We're constantly testing new devices and documenting our work on our developer site, <a href="https://wiki.commotionwireless.net">wiki.commotionwireless.net</a>.</p>
 
-<p>If your device is not listed here, we encourage you to look on the <a href="https://wiki.commotionwireless.net/doku.php?id=hardware_in_testing">developer site wiki</a>, or <a href="/contact">contact us</a> to ask about it!</p>
+<p>If your device is not listed here, we encourage you to look on the <a href="https://wiki.commotionwireless.net/doku.php?id=development_resources:router:hardware_in_testing">developer site wiki</a>, or <a href="/contact">contact us</a> to ask about it!</p>
 
 <div id="routers" style="width:100%;">
 <h2>Supported Devices by Category</h2>

commotionwireless.net/download/routers/index.md

@@ -29,6 +29,7 @@ lang: en
 <p>Commotion Router is a distribution of OpenWRT Linux that supports the wireless routers listed by vendor below. If you're not sure which file to download, check the full list of&nbsp; <a href="/docs/supported-devices">devices we currently support</a>.</p>
 
 <p>Don't see your device listed? Check the <a href="https://wiki.commotionwireless.net/doku.php?id=hardware_in_testing">Commotion Router Developer Hardware in testing wiki page</a> for a full list of devices being tested with Commotion OpenWRT.</p>
+<p>If you are updating from older versions of Commotion (Pre-Release, Developer Release, or 1.0 versions), we recommend reading over the <a href="https://wiki.commotionwireless.net/doku.php?id=general_resources:documentation:router:upgrading_from_previous_versions">Upgrade Guide</a> on our <a href="https://wiki.commotionwireless.net/">wiki</a>. It provides step-by-step instructions and a few important tips to make sure your upgrade goes smoothly.</p>
 
 <p><strong>Current Release:</strong> v1.1 "Grumpy Cat"</p>
 

commotionwireless.net/fonts/Asap SIL OFL Font License 1.1.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2011, Omnibus-Type (www.omnibus-type.com|omnibus.type@gmail.com), 
+with Reserved Font Name "Asap".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.