Merge branch 'master' of https://github.com/DennisOSRM/dennisosrm.github.com

Author: DennisOSRM

index.html

@@ -18,7 +18,7 @@
 <hr>
 <a href="http://map.project-osrm.org/"><img src="images/demo-screenshot.png" alt="Screen Shot"></a>
 <hr>
-Try our amazing public routing service at <a href="http://map.project-osrm.org/">http://map.project-osrm.org/</a> or follow us on <a href="https://twitter.com/#!/ProjectOSRM">Twitter</a>.
+Try our amazing public routing service at <a href="http://map.project-osrm.org/">http://map.project-osrm.org/</a>, meet us on <a href="irc://irc.oftc.net/osrm">IRC</a> (server: irc.oftc.net, channel: #osrm) or follow us on <a href="https://twitter.com/#!/ProjectOSRM">Twitter</a>.
 <p>
 <iframe style="border: 0; margin: 0; padding: 0;" src="https://www.gittip.com/DennisOSRM/widget.html" width="48pt" height="22pt"></iframe>
 <A NAME="buildstatus"><h2>Current build status:</h2></A>
@@ -47,6 +47,8 @@ <h2> Support </h2>
   </li>
   <li> <b>Mailing list </b> [<a href="http://lists.openstreetmap.org/listinfo/osrm-talk">here</a>]
   </li>
+  <li> <b>IRC Channel </b> [<a href="irc://irc.oftc.net/osrm">server: irc.oftc.net, channel: #osrm</a>]
+  </li>
   <li> <b>Bug Tracker </b> [<a href="https://github.com/DennisOSRM/Project-OSRM/issues">here</a>]
   </li>
 </ul>
@@ -69,10 +71,10 @@ <h2>About the Project</h2>
 <ul style="margin-left: 20px;">
 
   <li> High Performance Routing Algorithm </li>
-  <li> Easy import of OSM data files. </li>
+  <li> Flexible import of OSM data files </li>
   <li> Written entirely in C++ and available under the very permissive <a href="https://github.com/DennisOSRM/Project-OSRM/blob/master/LICENCE.TXT">(simplified) 2-clause BSD license</a> for anyone to use. Previously, it was licensed under the restrictive AGPL.</li>
-  <li> Ability to handle continental sized networks. </li>
-  <li> Influenced by current and ongoing academic research. [<a href="http://algo2.iti.kit.edu/routeplanning.php">more info</a>]
+  <li> Ability to handle continental sized networks </li>
+  <li> Influenced by current and ongoing academic research: [<a href="http://algo2.iti.kit.edu/routeplanning.php">more info</a>]
   </li>
 </ul>
 
@@ -117,9 +119,9 @@ <h2> Platforms supported </h2>
 
 <h2> Current version </h2>
 
-<p> Version 0.1 (July 10, 2010) is a baseline release. It has basic features. Version 0.2 (March 2011) is much faster and resource friendly. While it is safe to use this version, the code in git master branch is much more advanced. Version 0.3.6 is the current release that is geared toward new and exciting features.</p>
+<p> Version 0.1 (July 10, 2010) is a baseline release. It has basic features. Version 0.2 (March 2011) is much faster and more resource friendly. After that the project switched to a rolling release. Version 0.3.7 is the current release that is geared toward new and exciting features.</p>
 
-<h2> Major improvements in version 0.3 over 0.2</h2>
+<!--h2> Major improvements in version 0.3 over 0.2</h2>
 <table>
 
   <tbody>
@@ -150,7 +152,7 @@ <h2> Major improvements in version 0.3 over 0.2</h2>
   <li> many, many bug fixes </li>
   <li> many under-the-hood improvements </li>
   <li> For a detailed list, please read the <a href="https://github.com/DennisOSRM/Project-OSRM/commits/master">Timeline</a>. </li>
-</ul>
+</ul-->
 </td>
       <td>
 
@@ -168,30 +170,16 @@ <h2> Links/Download </h2>
       <td>
       </td>
       <td> <b>Current Stable Version </b> </td>
-      <td> <b>Previous Stable Version </b> </td>
       <td> <b>Development Version </b> </td>
     </tr>
     <tr>
       <td>
 
          Download:
       </td>
-      <td> [<a href="https://github.com/DennisOSRM/Project-OSRM/archive/v0.3.6.zip">v0.3.6 tarball</a>] </td>
-      <td> [<a href="https://github.com/DennisOSRM/Project-OSRM/archive/v0.3.5.zip">master tarball</a>] </td>
+      <td> [<a href="https://github.com/DennisOSRM/Project-OSRM/archive/v0.3.7.zip">v0.3.7 tarball</a>] </td>
       <td> [<a href="https://github.com/DennisOSRM/Project-OSRM/archive/develop.zip">develop tarball</a>] </td>
     </tr>
-    <tr>
-      <td>
-       Git repository:
-      </td>
-      <td> [see above]
-		</td>
-      <td> [Browse] [Checkout]
-		</td>
-      <td> [<a href="https://github.com/DennisOSRM/Project-OSRM">Browse</a>]
-[<a href="https://github.com/DennisOSRM/Project-OSRM.git">Checkout</a>]
-</td>
-    </tr>
   </tbody>
 </table>
 </p>