Merge branch 'develop' into documentation/JAL-3407_2.11.1_release

diff --git a/RELEASE b/RELEASE
index 1960368..f6e3b96 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
-jalview.release=releases/Release_2_11_Branch
-jalview.version=2.11.0
+jalview.release=releases/Release_2_11_1_Branch
+jalview.version=2.11.1

diff --git a/help/help/html/index.html b/help/help/html/index.html
index 62b46a9..36ed33a 100755 (executable)
--- a/help/help/html/index.html
+++ b/help/help/html/index.html
@@ -83,9 +83,11 @@
     <li>Jalview 2
       <ul>
         <li>Jim Procter</li>
-        <li>Andrew Waterhouse</li>
         <li>Mungo Carstairs</li>
+        <li>Ben Soares</li>
+        <li>Kira Mour&atilde;o</li>
         <li>Tochukwu 'Charles' Ofoegbu</li>
+        <li>Andrew Waterhouse</li>
         <li>Jan Engelhardt</li>
         <li>Lauren Lui</li>
         <li>Anne Menard</li>

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 0a20650..7895dc4 100755 (executable)
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -57,6 +57,29 @@ li:before {
     </tr>
     <tr>
       <td width="60" align="center" nowrap>
+          <strong><a name="Jalview.2.11.1">2.11.1</a><br />
+            <em>01/10/2019</em></strong>
+      </td>
+      <td align="left" valign="top">
+        <ul>
+          <li><!-- -->
+          </li>
+        </ul>
+        <em>Deprecations</em>
+      </td>
+      <td align="left" valign="top">
+        <ul>
+        </ul>
+        <em>Java 11 Compatibility issues</em>
+        <ul>
+          <li>
+            <!-- JAL-2987 -->OSX - Can't view results in PDB/Uniprot FTS
+          </li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td width="60" align="center" nowrap>
           <strong><a name="Jalview.2.11.0">2.11.0</a><br />
             <em>04/07/2019</em></strong>
       </td>