X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=web%2Fhtml%2Fdocumentation.html;h=c4e340b48562947d10fddfdeb2c8c2ee5b213fb8;hb=601e76c57135056b8e0997019c49f3c695d61e45;hp=d722c8ea0914e304982a03274146d2abbaebd463;hpb=759de538156bbd2810075a5fd14ce9ddb3fbd274;p=debian%2Fopenrocket

diff --git a/web/html/documentation.html b/web/html/documentation.html
index d722c8ea..c4e340b4 100644
--- a/web/html/documentation.html
+++ b/web/html/documentation.html
@@ -25,15 +25,18 @@
         <li><a href="features.html">Features and screenshots</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="documentation.html">Documentation</a></li>
-        <li><a href="https://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://sourceforge.net/apps/mediawiki/openrocket/">Wiki pages</a></li>
+        <li><a href="http://openrocket.trans.free.fr/">Translations</a></li>
         <li><a href="getinvolved.html">Get involved!</a></li>
         <li><a href="contact.html">
           Mailing lists<br/>
           Support forums<br/>
 	  Contact info</a></li>
+<!--
         <li><a href="report.html">
           Report a bug<br/>
 	  Request a feature</a></li>
+-->
         <li><a href="license.html">License</a></li>
       </ul>
       <div class="logo">
@@ -55,14 +58,28 @@
     <p>If you would like to help, please extend the documentation!</p>
     <h2>Technical documentation</h2>
     <p>OpenRocket was originally written as the Master's thesis of
-    Sampo Niskanen at Helsinki University of Technology.  The thesis
-    currently functions as the technical documentation, and will be
-    updated in the future to account for further enhancements.
-    The thesis is licensed under a
-    <a rel="license" href="http://creativecommons.org/licenses/by-nd-nc/1.0/fi/deed.en">Creative Commons BY-NC-ND License</a>.</p>
-    <p class="right"><a rel="license" href="http://creativecommons.org/licenses/by-nd-nc/1.0/fi/deed.en"><img alt="Creative Commons BY-NC-ND License" src="http://i.creativecommons.org/l/by-nd-nc/1.0/fi/88x31.png" /></a></p>
-    <p><a href="thesis.pdf">Development of an Open Source model
-    rocket simulation software</a> (PDF, 1.3MB)</p>
+    Sampo Niskanen at Helsinki University of Technology.  This thesis
+    is being extended and updated as the OpenRocket technical
+    documentation.  Below is the latest technical documentation and
+    the original Master's thesis.</p>
+    <div class="separated">
+      <p>
+	<span class="licenseimage"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="CC BY-SA" src="cc-by-sa-80x15.png" /></a></span>
+	<a href="techdoc.pdf">OpenRocket technical documentation</a> (2011-07-18)
+	&nbsp;&nbsp; <span class="note">(PDF&nbsp;1.4MB)</span>
+      </p>
+      <p>
+	<span class="licenseimage"><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/"><img alt="CC BY-NC-ND" src="cc-by-nc-nd-80x15.png" /></a></span>
+	<a href="thesis.pdf">Development of an Open Source model rocket simulation software</a> (Master's thesis)
+	&nbsp;&nbsp; <span class="note">(PDF&nbsp;1.3MB)</span>
+      </p>
+    </div>
+    <p>The technical documentation is licensed under a
+    <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike License</a>
+    while the Master's thesis is licensed under a
+    <a rel="license" href="http://creativecommons.org/licenses/by-nd-nc/1.0/fi/deed.en">Attribution-NonCommercial-NoDerivs
+    License</a>.
+    </p>
     <p class="quote"><strong>Table of contents:</strong></p>
     <ol class="toc">
       <li>1. Introduction</li>
@@ -84,14 +101,6 @@
       wiki page</a>, including links to Barrowman's original report and
       thesis, extensions for the Barrowman method, experimental rocket
       data etc.</p>
-      <div class="t"></div>
-  <div class="r"></div>
-  <div class="b"></div>
-  <div class="l"></div>
-  <div class="tr"></div>
-  <div class="tl"></div>
-  <div class="br"></div>
-  <div class="bl"></div>
   </div>
   <div class="valid">
     <p><a href="http://validator.w3.org/check/referer"><img src="valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a>