Merge branch 'master' of github.com:cpp-netlib/cpp-netlib.github.com

deanberris · deanberris · commit 44719ccb18b4 · 2014-01-25T22:56:52.000+11:00
Conflicts:
	index.html
diff --git a/index.html b/index.html
@@ -29,7 +29,7 @@ <h1>The C++ Network Library Project</h1>
         <p class="lead">A collection of open-source libraries for high level network programming.</p>
         </header>
         <div class="row">
-          <div class="col-md-3" id="cpp-netlib-docs-sidebar" role="complimentary" >
+          <div class="col-md-3" id="cpp-netlib-docs-sidebar" role="complimentary">
             <ul class="nav list-group cpp-netlib-sidebar" data-spy="affix" data-offset-top="245">
               <li class="list-group-item"><a href="#overview">Overview</a></li>
               <li class="list-group-item"><a href="#download">Download</a></li>
@@ -66,27 +66,25 @@ <h1>Download</h1>
                 <div class="col-md-4">
                 <a
                   href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.zip"
-                  class="btn btn-primary btn-lg btn-block">0.11.0 (zip)<br>
+                  class="btn btn-primary btn-lg btn-block">0.11.0 (zip)</a>
+                  <br>
                   <small class="text-muted cpp-netlib-hash">md5: 7d08b5738970b9549a75ec98ee4986be</small>
-                </a>
                 </div>
                 <div class="col-md-4">
                 <a
                   href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.tar.gz"
-                  class="btn btn-primary btn-lg btn-block">0.11.0 (tar.gz)<br>
+                  class="btn btn-primary btn-lg btn-block">0.11.0 (tar.gz)</a>
+                  <br>
                   <small class="text-muted cpp-netlib-hash">md5: 6fba4f2f64f19af9f172fd60ad8e76ab</small>
-                </a>
                 </div>
                 <div class="col-md-4">
                 <a
                   href="http://commondatastorage.googleapis.com/cpp-netlib-downloads/0.11.0/cpp-netlib-0.11.0.tar.bz2"
-                  class="btn btn-primary btn-lg btn-block">0.11.0 (tar.bz2)<br>
+                  class="btn btn-primary btn-lg btn-block">0.11.0 (tar.bz2)</a>
+                  <br>
                   <small class="text-muted cpp-netlib-hash">md5: 0765cf203f451394df98e6ddf7bf2541</small>
-                </a>
                 </div>
               </div>
-              <p>You can download <a href="https://github.com/cpp-netlib/cpp-netlib/downloads">previous releases</a> of the library from our
-              Github download page.</p>
             </section>
             <section id="documentation">
               <div class="page-header">
diff --git a/process.html b/process.html
@@ -123,7 +123,7 @@ <h2>Preparing a PR</h2>
               date.</strong> To do this you should first pull changes to your
               local master (assuming that's where you'd like to send a pull
               request to), rebase your integration branch to the tip of master,
-              then make sure all merge conflicts are dealt with. Proceed ony
+              then make sure all merge conflicts are dealt with. Proceed only
               when your integration branch is up-to-date with the official
               branch you're going to send your PR to.</li>
               <li><strong>Send the PR.</strong> Once you're reasonably happy
diff --git a/static/cpp-netlib.css b/static/cpp-netlib.css
@@ -9,7 +9,7 @@ html, body { padding-top: 20px; }
 #push, #footer { height: 80px;}
 #footer { background-color: #f5f5f5; }
 .credit { text-align: center; }
-.cpp-netlib-hash { font-size: 11px; }
+.cpp-netlib-hash { font-size: 11px; text-align: center; }
 .list-group-item a:link {color: black; }
 .list-group-item a:visited {color: black; }
 .list-group-item a:hover {color: black; }
