geodetic computations

[debian/openrocket] / web / htp / documentation.htp

diff --git a/web/htp/documentation.htp b/web/htp/documentation.htp
index 9a3478cda9cbc4d48f8f9cceb6f823b02a64ead8..1731f3f3e3ece047eaabdf1d1bedbea26b06c6ed 100644 (file)
--- a/web/htp/documentation.htp
+++ b/web/htp/documentation.htp
@@ -24,18 +24,31 @@
     <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>
@@ -55,6 +68,7 @@
     </ol>
 
 
+
     <h2>Resources</h2>
 
     <p>A list of useful technical rocketry resources is available in