From 750c116fd45133a73acd57639c8a4bdbce57578d Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 5 Sep 2018 14:28:50 +0100
Subject: [PATCH] JAL-3091 release notes for updated memory settings

---
 help/html/memory.html   |   13 ++++++++++++-
 help/html/whatsNew.html |   24 ++++++++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/help/html/memory.html b/help/html/memory.html
index 2142f98..9437a60 100755
--- a/help/html/memory.html
+++ b/help/html/memory.html
@@ -115,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>
@@ -125,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>
@@ -140,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>
diff --git a/help/html/whatsNew.html b/help/html/whatsNew.html
index 4dfc54e..1e4fbd0 100755
--- a/help/html/whatsNew.html
+++ b/help/html/whatsNew.html
@@ -30,6 +30,12 @@
     patches for users working with Ensembl, and RNA secondary structure
     annotation.</p>
   <ul>
+    <li>Jalview's default memory limit increased to 1G. If you have
+      problems starting Jalview 2.10.5 and you have 1G or less
+      physical memory on your machine, you will need to <a
+      href="memory.html#memsetting">reduce the memory</a> allocated to
+      Jalview.
+    </li>
     <li>EPS, PNG and SVG export now includes hidden sequence
       markers, and representative sequences are marked in bold.</li>
     <li>Ensembl Client updated for Ensembl Rest API v7.<br />The
@@ -44,14 +50,20 @@
   </ul>
   <p>
     The full list of bugs fixed in this release can be found in the <a
-      href="releases.html#Jalview.2.10.5">2.10.5 Release Notes</a>. The majority of improvement in 2.10.5 are due to Jalview users
+      href="releases.html#Jalview.2.10.5">2.10.5 Release Notes</a>. The
+    majority of improvement in 2.10.5 are due to Jalview users
     contacting us via the jalview-discuss email list. Thanks to everyone
-    who took the time to do this !</p>
-    <p><strong>Jalview and Java 10</strong></p>
+    who took the time to do this !
+  </p>
+  <p>
+    <strong>Jalview and Java 10</strong>
+  </p>
   <p>This release addresses a critical bug for OSX users who are
     running Jalview with Java 10 which can prevent files being saved
-    correctly through the 'Save As' dialog box. The 'Save As' dialog for
-    Jalview's Groovy Console remains affected - we hope to address this
-    in the next major release.</p>
+    correctly through the 'Save As' dialog box.</p>
+  <p>The 'Save As' dialog for Jalview's Groovy Console remains
+    affected: the workaround is to create a new file outside of Jalview
+    and then select it when saving your groovy script. We hope to
+    address this in the next major release.</p>
 </body>
 </html>
-- 
1.7.10.2