From d5cd3ea16b732d2477df4209edc54333d1a369c0 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 4 Aug 2020 19:30:47 +0100
Subject: [PATCH] JAL-3477 Improved command line arguments description in
 memory.html

---
 help/help/html/memory.html |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/help/help/html/memory.html b/help/help/html/memory.html
index 80bffa3..0374dcb 100755
--- a/help/help/html/memory.html
+++ b/help/help/html/memory.html
@@ -93,12 +93,13 @@
       Adjusting this default (via a JVL file, above) will allow larger amounts (or can limit the amount) of memory to be allocated to Jalview in conjunction with the jalview.jvmmempc setting. 
       <br/><br/>
     </li>
-    <li><em><font size="3"><a name="jar">Command line arguments when using the executable jar (jalview-all.jar)</a></em><br/>
-      If you are using the Jalview standalone executable jar, (usually named <em>jalview-all-....jar</em> with a Jalview and Java version designation),
-      then you can set the <em>jvmmempc</em> and <em>jvmmemmax</em> values using application command line arguments <em>-jvmmempc=N</em>
-      and <em>-jvmmemmax=M</em> respectively, e.g.
+    <li><em><font size="3"><a name="jar">Command line arguments when using the executable jar (jalview-all.jar) or jalview.bin.Launcher</a></em><br/>
+      If you are using the Jalview standalone executable jar (usually named <em>jalview-all-....jar</em> with a Jalview and Java version designation) or using <em>jalview.bin.Launcher</em> to start Jalview,
+      then you can set the <em>jvmmempc</em> and <em>jvmmemmax</em> values using application command line arguments <em>-jvmmempc=PERCENT</em>
+      and <em>-jvmmemmax=MAXMEMORY</em> respectively.  <em>PERCENT</em> should be an integer between 1 and 100, and MAXMEMORY should be an amount of memory in bytes, or you can append a "k", "m", "g", or "t" to use units of kilobytes, megabytes, gigabytes or terabytes, e.g.
       <pre>java -jar jalview-all-2.11.1.0-j1.8.jar -jvmmempc=50 -jvmmemmax=20g</pre>
       (this example will launch Jalview with a maximum heap size of the smaller of 20GB or 50% of physical memory detected).
+      <br/>The default value for jvmmempc is 90, whilst the default value for jvmmemmax is 32g if Jalview can determine a total physical memory size of the host system, and a more cautious 8g if Jalview is unable to determine a total physical memory size.
       <br/><br/>
     </li>
     <li><em><font size="3"><a name="jvm"/>Directly opening Jalview
-- 
1.7.10.2