Copy cleanups

* Linux -> GNU/Linux
* Spelling and grammar fixes, awkward phrasing changes
* Another attempt at text for the index

diff --git a/contact.shtml b/contact.shtml
index cf017aa..12d3c3c 100644 (file)
--- a/contact.shtml
+++ b/contact.shtml
@@ -6,8 +6,12 @@
 
 <table>
 <tr colspan="2" height="50px">
-<td width="150px" valign="top"><strong>Chat</strong></td>
-<td valign="top"><a href="irc://irc.freenode.net/#hcoop">#hcoop</a> on <a href="http://freenode.net/">Freenode</a>&nbsp;&nbsp;&nbsp;(This is an <a href="http://www.irchelp.org/" target="_blank">Internet Relay Chat</a> channel where you can ask our admins questions.)</td>
+<td width="150px" valign="top"><strong>Chat</strong></td> <td
+valign="top"><a href="irc://irc.freenode.net/#hcoop">#hcoop</a> on <a
+href="http://freenode.net/">Freenode</a>&nbsp;&nbsp;&nbsp;(This is an
+<a href="http://www.irchelp.org/" target="_blank">Internet Relay
+Chat</a> channel where you can ask other users questions or generally
+chatter.)</td>
 </tr>
 
 <tr colspan="2" height="50px">
@@ -32,7 +36,9 @@
 
 <tr colspan="2" height="50px">
 <td width="150px" valign="top"><strong>Bugs and Fixes</strong></td>
-<td valign="top">Bugs and things requiring fixes can be reported in our <a href="https://bugzilla.hcoop.net/enter_bug.cgi">Bugzilla database</a>.</td>
+<td valign="top">Bugs, things requiring fixes, and anything you are
+         unsure about can be reported through our <a
+           href="https://bugzilla.hcoop.net/enter_bug.cgi">bug tracker</a>.</td>
 </tr>
 </table>
 </div>

diff --git a/index.shtml b/index.shtml
dissimilarity index 65%
index e4fff1c..892a654 100644 (file)
--- a/index.shtml
+++ b/index.shtml
@@ -1,24 +1,31 @@
-<!--#include file="header.html" -->
-<div id="main">
-<h2>The Original Internet Hosting Cooperative</h2>
-<p><em>[Whatever text we put here should be catchy and highly relevant to prospective new members. I just grabbed this from the wiki for now.]</em> We're a registered Pennsylvania (USA) non-profit corporation with HcoopBylaws that put complete control and ownership of the co-op in the hands of the members. Each member has an equal vote on issues ike electing the board of directors. The board makes all of the day-to-day decisions that control how the co-op works socially and technically.<br />
-<br />
-HCoop is also recognized by the IRS as a 501(c)(12) tax-exempt cooperative, and thus is not liable for any federal income tax. </p>
-
-<div id="container">
-
-<div><!-- column 1 -->
-<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" /> 10 GB Storage</p>
-<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" />
-                         Shell Account</p>
-<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" /> US $7 / month</p>
-</div>
-<div class="col2">
-Duis magna elit, bibendum non hen- drerit et, volutpat pharetra sapien.
-</div>
-<div class="col3">
-Cras libero est, con- dimentum nec porta et, blandit sed dui. Duis magna elit, bibendum non hen- drerit et, volutpat pharetra sapien.
-</div>
-</div>
-</div>
-<!--#include file="footer.html" -->
+<!--#include file="header.html" -->
+<div id="main">
+<h2>The Internet Hosting Cooperative</h2>
+
+<p>We are an Internet hosting service and community, run
+democratically as a USA 501(c)(12) non-profit corporation. HCoop
+members pool their resources to support most any services that qualify
+as "Internet hosting."</p>
+
+<div id="container">
+
+<div><!-- column 1 -->
+<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" /> 10 GB Storage</p>
+<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" />
+                         Shell Account</p>
+<p class="big"><img src="css/images/checkmark.jpg" alt="checkmark" /> US $7 / month</p>
+</div>
+<div class="col2">
+We're fans of Free Software and release all of our <a
+         href="http://git.hcoop.net/?a=project_list;o=age;pf=hcoop">custom
+         software under Free licenses</a>.
+</div>
+<div class="col3">
+We are cooperatively organized and not-for-profit (all revenue goes
+       toward improving services), adhering to the <a
+       href="http://wiki.hcoop.net/SevenPrinciples">Seven
+       Principles</a>.
+</div>
+</div>
+</div>
+<!--#include file="footer.html" -->

diff --git a/join.shtml b/join.shtml
index 2d994b1..bf5d55a 100644 (file)
--- a/join.shtml
+++ b/join.shtml
@@ -7,7 +7,7 @@ HCoop is currently accepting new members and only asks that you meet the followi
 <ul>
 <li><strong>Pay $7/month in United States dollars.</strong> Most members pay with <a href="http://www.paypal.com/">Paypal</a> or <a href="http://checkout.google.com/">Google Checkout</a>, which can process major credit cards or pull money from your bank account.
 </li>
-<li><strong>Use a basic Linux working environment.</strong> Most of our members are fairly technically inclined, but some aren't. If you haven't used Linux before, it doesn't have to be a deal breaker for you and HCoop. If you're good with computers and willing to do a little learning, you should be fine. Other HCoop members will probably be willing to help you through the use of our <a href="https://lists.hcoop.net/listinfo/hcoop-help">hcoop-help</a> mailing list.
+<li><strong>Use a basic GNU/Linux working environment.</strong> Most of our members are fairly technically inclined, but some aren't. If you haven't used GNU/Linux before, it doesn't have to be a deal breaker for you and HCoop. If you're good with computers and willing to do a little learning, you should be fine. Other HCoop members will probably be willing to help you through the use of our <a href="https://lists.hcoop.net/listinfo/hcoop-help">hcoop-help</a> mailing list.
 </li>
 <li><strong>Agree to our <a href="tos.html">Terms of Service</a>.</strong> Nothing too weird.
 </li>

diff --git a/what.shtml b/what.shtml
index b9ef6ee..4e22819 100644 (file)
--- a/what.shtml
+++ b/what.shtml
@@ -11,11 +11,9 @@ anything from a superuser. Since we provide a generic
 Debian GNU/Linux shell, you can write and run your own
 daemons in whatever programming language you fancy.</p>
 
-<p>We support Free Software, and release all of our
-custom software <a
-href="http://wiki.hcoop.net/Code">under Free
-licenses</a>, and are committed to using only Free
-Software in our infrastructure.</p>
+<p>We support Free Software, releasing all of our custom software <a
+href="http://wiki.hcoop.net/Code">under Free licenses</a>, and using
+only Free Software for our infrastructure.</p>
 
 <p>Our <a
 href="http://wiki.hcoop.net/Hardware">servers</a> are
@@ -30,55 +28,59 @@ staff.</p>
       <col style="width: 70%" />
   </colgroup>
 
-  <tr><td><strong>Storage</strong></td><td> Around ten
-      gigabytes of storage. You can request more disk
-      space as needed; our quotas are only in place to
-      prevent oversubscription of storage. As we add
-      more storage, all members benefit.</td></tr>
+  <tr><td><strong>Storage</strong></td><td>Around ten gigabytes of
+      storage. You can request more disk space as needed; we have
+      quotas in place to prevent over-subscription of storage and
+      strive to grant any reasonable requests so long as we have the
+      resources for it. As we add more storage, all members
+      benefit.</td></tr>
 
   <tr><td><strong>Bandwidth</strong></td><td>We currently have a 5Mbps
   connection (<a
   href="http://en.wikipedia.org/wiki/Burstable_billing">95th
   percentile</a> billing) burstable to 100Mbps. If your sites see less
-  than a hundred or so gigabytes of traffic per months, we can
-  feasibly host you. As membership expands, we intend to get more
-  bandwidth (hopefully 100Mbps unmetered eventually).</td></tr>
+  than fifty or so gigabytes of traffic per month, we can feasibly
+  host you.</td></tr>
 
   <tr><td><strong>OpenAFS</strong></td><td>A
-      publically accessible <a
+      publicly accessible <a
         href="http://openafs.org">OpenAFS</a> cell
       (<tt>/afs/hcoop.net/</tt> the whole world
       round). This lets you access your HCoop storage as
       if it were local disk on every major operating
       system.</td></tr>
 
-  <tr><td><strong>Web
-        Hosting</strong></td><td>General web hosting with
-      Apache, featuring the usual languages (perl, php,
-      python) and databases (PostgreSQL and
-      MySQL). Unlike many providers, we'll install most
-      anything available in Debian so you can run that
-      Haskell web application with ease.</td></tr>
+  <tr><td><strong>Web Hosting</strong></td><td>General web hosting
+        with Apache, featuring the usual languages (Perl, PHP, Python)
+        and databases (PostgreSQL and MySQL). Unlike many providers,
+        we'll install most anything available in Debian so you can run
+        that Haskell web application with ease.</td></tr>
 
-  <tr><td><strong>Email</strong></td><td>Mail hosting for unlimited domains (including
-      <a href="https://webmail.hcoop.net">webmail</a>
-      through Roundcube), with the ability to create
-      virtual mailboxes for friends and family.</td></tr>
+  <tr><td><strong>Email</strong></td><td>Mail hosting for unlimited
+      domains (including <a
+      href="https://webmail.hcoop.net">webmail</a> through Roundcube,
+      IMAP, and POP3 access), with the ability to create virtual
+      mailboxes for friends and family.</td></tr>
 
-  <tr><td><strong>Mailing Lists</strong></td><td>Mailing lists through GNU Mailman.</td></tr>
+  <tr><td><strong>Mailing Lists</strong></td><td>Mailing lists through
+  GNU Mailman. Members <a
+  href="https://lists.hcoop.net/listinfo/">host lists</a> for pretty
+  much anything: volunteer organizations, Linux User Groups,
+  programming language development, even coordinating homebrewing
+  sessions.</td></tr>
 
   <tr><td><strong>Shell</strong></td><td>A shell account on a machine running Debian's
       latest stable release. We don't mind folks idling
       on Freenode, and you're free to do things like
       building software.</td></tr>
 
-  <tr><td><strong>Etc.</strong></td><td>Shared services for the benefit of all
-      members. These currently include a <a
-        href="http://git.hcoop.net">git server</a>,
-      managed <a href="http://moinmo.in/">MoinMoin</a>
-      install, and Jabber chat. We hope to offer GNU
-      Mediagoblin, Diaspora*, Gitorious, darcsweb, and
-      other services in the future.</td></tr>
+  <tr><td><strong>Etc.</strong></td><td>Volunteers host shared
+      services for the benefit of all members. These currently include
+      a <a href="http://git.hcoop.net">git server</a>, managed <a
+      href="http://moinmo.in/">MoinMoin</a> install, and Jabber
+      (<tt>you@HCOOP.NET</tt>). We hope to offer GNU Mediagoblin,
+      Diaspora*, Gitorious, darcsweb, and other services in the future
+      (or: insert your idea here).</td></tr>
 </table>
 </div>
 <!--#include file="footer.html" -->

diff --git a/who.shtml b/who.shtml
index 74fd23e..8d7665b 100644 (file)
--- a/who.shtml
+++ b/who.shtml
@@ -6,7 +6,7 @@ HCoop is an internet hosting service which operates in the form of a non-profit
 
 <br /><br />
 
-HCoop members range from individuals who have never hosted or managed a website before (but want to learn) to experienced Linux programmers and system administrators. HCoop strives to support all levels of technical expertise. Our members are located across four continents in 17 different countries. Although our servers are located in Jamaica, New York, USA, and the non-profit is registered in Pennsylvania, USA, due to the modern conveniences of the internet, members can participate fully from anywhere where there is an internet connection.
+HCoop members range from individuals who have never hosted or managed a website before (but want to learn) to experienced GNU/Linux programmers and system administrators. HCoop strives to support all levels of technical expertise. Our members are located across four continents in 17 different countries. Although our servers are located in Jamaica, New York, USA, and the non-profit is registered in Pennsylvania, USA, due to the modern conveniences of the internet, members can participate fully from anywhere where there is an internet connection.
 
 <br /><br />