Merge branch 'develop' into releases/Release_2_10_Branch

diff --git a/RELEASE b/RELEASE
index 702d6e7..9bc5817 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
-jalview.release=Release_2_10_0_Branch
-jalview.version=2.10.0b1
+jalview.release=releases/Release_2_10_1_Branch
+jalview.version=2.10.1

diff --git a/help/help.jhm b/help/help.jhm
index 407899e..e034fc2 100755 (executable)
--- a/help/help.jhm
+++ b/help/help.jhm
@@ -22,7 +22,7 @@
    <mapID target="home" url="html/index.html" />
    
    <mapID target="new" url="html/whatsNew.html"/>
-   <mapID target="release" url="html/releases.html#Jalview.2.10.0b1"/>
+   <mapID target="release" url="html/releases.html#Jalview.2.10.1"/>
    <mapID target="alannotation" url="html/features/annotation.html"/>
    <mapID target="keys" url="html/keys.html"/>
    <mapID target="newkeys" url="html/features/newkeystrokes.html"/>

diff --git a/help/helpTOC.xml b/help/helpTOC.xml
index bf1710c..3a6b0b3 100755 (executable)
--- a/help/helpTOC.xml
+++ b/help/helpTOC.xml
@@ -23,9 +23,6 @@
 <!-- DO NOT WRAP THESE LINES - help2Website relies on each item being on one line! -->
        <tocitem text="Jalview Documentation" target="home" expand="true">
                        <tocitem text="What's new" target="new" expand="true">
-                               <tocitem text="Retrieval from ENSEMBL" target="ensemblfetch" />
-                               <tocitem text="UniProt Free Text Search" target="uniprotfetcher" />
-                               <tocitem text="SIFTS for mapping PDB structures to UniProt" target="siftsmapping" />
                                <tocitem text="Latest Release Notes" target="release"/>
                </tocitem>
                

diff --git a/help/html/releases.html b/help/html/releases.html
index 441b394..4077a83 100755 (executable)
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -59,13 +59,10 @@
               for all consensus calculations
             </li>
             <li>
-              <!-- JAL-2177 -->Updated Jmol shipped with applet and
-              desktop to 14.6.4
+              <!-- JAL-2177 -->Jmol updated to version 14.6.4 (released 3rd Oct 2016)
             </li>
-            <li>
-              <!--  -->
-            </li>
-
+            <li>Updated Jalview's Certum code signing certificate
+              for 2016-2017</li>
           </ul>
           <em>Application</em>
           <ul>
@@ -100,14 +97,6 @@
               MSAviewer
             </li>
           </ul>
-<!--  -->          <em>Applet</em>
-          <ul>
-          </ul> -->
-          <em>Build and deployment</em>
-          <ul>
-            <li>Updated Jalview's Certum code signing certificate
-              for 2016-2017</li>
-          </ul>
         </div></td>
       <td>
         <div align="left">
@@ -200,20 +189,10 @@
               lysozyme results in a PDB Client error dialog box
             </li>
           </ul>
-          <!-- 
-          <em>Applet</em>
-          <ul>
-          </ul> -->
-          <em>Build and deployment</em>
-          <ul>
-            <li>
-              <!-- JAL-2308, -->Failing/passing unit tests
-            </li>
-          </ul>
-          <em>New Known Issues</em>
+<!--           <em>New Known Issues</em>
           <ul>
             <li></li>
-          </ul>
+          </ul> -->
         </div>
       </td>
     </tr>