X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=help%2Fhtml%2Fmemory.html;h=9437a60e1c8619787181a43ddd8e1c51356099ba;hb=4b2392caa53f1de3400e7916d1d9c7b815d446f4;hp=edc277c993ea2a25314e84024c7d75eafad0d626;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git

diff --git a/help/html/memory.html b/help/html/memory.html
index edc277c..9437a60 100755
--- a/help/html/memory.html
+++ b/help/html/memory.html
@@ -1,7 +1,7 @@
 <html>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -63,15 +63,13 @@
         file. You can obtain a JNLP file with modified memory settings
         from our service with the following link (replace 2G with
         desired memory in G or M):<br /> <a
-          href="http://www.jalview.org/services/launchApp?jvm-max-heap=2G"
-        >http://www.jalview.org/services/launchApp?jvm-max-heap=2G</a>
+          href="http://www.jalview.org/services/launchApp?jvm-max-heap=2G">http://www.jalview.org/services/launchApp?jvm-max-heap=2G</a>
       </p>
       <p>
         Alternatively, if you want to create your own JNLP file then
         please download the latest JNLP file from <a
-          href="http://www.jalview.org/webstart/jalview.jnlp"
-        >http://www.jalview.org/webstart/jalview.jnlp</a> and modify the
-        max-heap-size parameter for the j2se tag in the
+          href="http://www.jalview.org/webstart/jalview.jnlp">http://www.jalview.org/webstart/jalview.jnlp</a>
+        and modify the max-heap-size parameter for the j2se tag in the
         &lt;resources&gt; element. e.g.
       <pre>
 &lt;j2se version="1.7+" initial-heap-size="500M" max-heap-size="1000M"/&gt;
@@ -109,6 +107,7 @@ lax.nl.java.option.java.heap.size.initial=500m
             The lines you need to change are in the <em>Info.plist</em>
             file inside the <em>Jalview.app/Contents</em> directory
             (which is where the installAnywhere installation was made) :
+
           
           <pre>
 &lt;key&ht;VMOptions&lt;/key&ht;
@@ -116,7 +115,7 @@ lax.nl.java.option.java.heap.size.initial=500m
 ! &lt;string&gt;-Xms2M&lt;/string&gt;
 ! &lt;string&gt;-Xmx64M&lt;/string&gt;
 &lt;/array&gt;
-</pre> Exchange the above two string tags for : <pre>
+</pre>Exchange the above two string tags for : <pre>
 &lt;string&gt;-Xms500M&lt;/string&gt;
 &lt;string&gt;-Xmx1000M&lt;/string&gt;
 </pre>
@@ -126,6 +125,11 @@ lax.nl.java.option.java.heap.size.initial=500m
       the file and try to start Jalview in the normal way. If it doesn't
       start, see below...</li>
   </ul>
+  <p>
+    <em>Please Note:</em> We do modify the default memory settings in
+    Jalview from time to time, so you may find different numbers to
+    those shown in the examples above.
+  </p>
   <font size="3"><em>Jalview doesn't start... What do the
       memory settings mean ?<a name="memsetting"></a>
   </em></font>
@@ -141,6 +145,12 @@ lax.nl.java.option.java.heap.size.initial=500m
     enlighten us if you know better!). Our experiments found 1000m to be
     the biggest setting that could be used on a 1GB machine. Just try
     reducing the sizes until Jalview starts up properly!</p>
+  <p>
+    We increased the default memory in Jalview 2.10.5 to 1G. To launch
+    Jalview with the pre 2.10.5 default memory allocation, use the <a
+      href="http://www.jalview.org/webstart/jalview_256MB.jnlp">Jalview
+      256MB JNLP</a>.
+  </p>
   <p>&nbsp;</p>
 </body>
 </html>
