X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=blobdiff_plain;f=web%2Fhtml%2Fdownload.html;h=f05661140a934024036b6b92ff7599fc6b6887d4;hp=dcaf1635c9e45b0ae154754da4b7e41431d92ec8;hb=f8aca85893990faf46d59ab89e9861f46c66dff3;hpb=6d71a8c4a93455ea8d3df1ed42d33b941847efcc

diff --git a/web/html/download.html b/web/html/download.html
index dcaf1635..f0566114 100644
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -65,37 +65,52 @@
     0.9.4 should upgrade immediately!</p>
 </div>
     <div class="contentholder">
-      <h2>Binary download</h2>
-      <p>The binary download below is the recommended package for general
-	use.  It is pre-packaged with motor thrust curves from
+      <h2>Ready packages</h2>
+      <p>These are packages ready for use and are the recommended
+	download for normal users.  They are pre-packaged with motor
+	thrust curves from
 	<a href="http://www.thrustcurve.org/">thrustcurve.org</a>.</p>
-      <p><em>OpenRocket requires <strong>Java version 6</strong> or
-	  later.  The Sun Java Runtime is recommended.</em></p>
+      <p>OpenRocket requires <strong>Java version 6</strong> or
+	  later.  The Sun Java Runtime is recommended.</p>
+      <h3>Development release</h3>
+      <p>The development release contains the latest and greatest
+	features, but may contain more bugs than the stable version.
+	Currently the development version is the recommended
+	download.</p>
+      <div class="right support">
+	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /> </a>
+      </div>
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.0.0/OpenRocket-1.0.0.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-1.0.0.jar</span>
+      <span>OpenRocket-1.1.0.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.0.0/OpenRocket-1.0.0-src.zip/download">Source code</a> |
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.0.0/ReleaseNotes/view">Release notes</a>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0-src.zip/download">Source code</a>
     </span>
   </div>
-      <p>You can also join the
-	<a href="https://lists.sourceforge.net/lists/listinfo/openrocket-announce"><tt>OpenRocket-announce</tt> mailing list</a>
-	to receive notification on new versions.</p>
+      <h3>Stable release</h3>
+      <p>Occasionally during OpenRocket development focus will shift
+	from feature development towards getting all open bugs fix and
+	to produce a stable release.  No updates are made to the
+	stable branch except for possible bug fixes, so the stable
+	release has less features than the development release.</p>
+      <p>The current stable release is
+	<tt><a class="main"
+	href="https://sourceforge.net/projects/openrocket/files/openrocket/1.0.0/OpenRocket-1.0.0.jar/download">OpenRocket-1.0.0.jar</a></tt></p>
+      <h3>Running OpenRocket</h3>
       <p>OpenRocket can be started in most graphical environments (including
 	Windows) by double-clicking the package icon.  No installation is
 	required.</p>
-      <p>From the command line OpenRocket can be started by</p>
-      <pre class="quote">$ java -jar OpenRocket-1.0.0.jar</pre>
+      <p>From the command line OpenRocket can be started by
+      <span class="command">java -jar OpenRocket-1.1.0.jar</span></p>
 	
-      <p>Older packages and source code are available from the
-	<a href="https://sourceforge.net/projects/openrocket/files/openrocket/">SourceForge repository</a>.</p>
     </div>
     <div class="clear"></div>
-    <h2>Source code</h2>
-    <p><strong>Source packages</strong> for OpenRocket are available in the
+    <h2>Source code and older versions</h2>
+    <p><strong>Source packages</strong> and older versions of
+      OpenRocket are available in the
       <a href="https://sourceforge.net/projects/openrocket/files/openrocket/">SourceForge repository</a>.</p>
     <p>Alternatively, the most recent development version can be
       obtained from the