X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=help%2FhelpTOC.xml;h=940629297cd56be3ed8039fe11b49fdf61085434;hp=bd5a9d543f6e8ca64ecb216f27f858e34938438e;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e

diff --git a/help/helpTOC.xml b/help/helpTOC.xml
index bd5a9d5..9406292 100755
--- a/help/helpTOC.xml
+++ b/help/helpTOC.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="ISO-8859-1"  ?>
 <!--
-   * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
-   * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-   * 
-   * This program is free software; you can redistribute it and/or
-   * modify it under the terms of the GNU General Public License
-   * as published by the Free Software Foundation; either version 2
-   * of the License, or (at your option) any later version.
-   * 
-   * This program is distributed in the hope that it will be useful,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * GNU General Public License for more details.
-   * 
-   * You should have received a copy of the GNU General Public License
-   * along with this program; if not, write to the Free Software
-   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * 
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
 <toc version="1.0">
 <tocitem text="Jalview Documentation" target="home" expand="true" >
 	<tocitem text="What's new" target="new" expand="true">
-      <tocitem text="Release History" target="release"/>
-		<tocitem text="Sequence Retrieval" target="seqfetch"/>
-		<tocitem text="VAMSAS Interoperation" target="vamsas"/>
+		<tocitem text="Viewing RNA structure" target="varna" />
+		<tocitem text="RNA Structure Consensus" target="calcs.alstrconsensus"/>
+		<tocitem text="RNA Helices coloring" target="colours.rnahelices"/>
 	</tocitem>
     <tocitem text="Editing Alignments" target ="edit"/>	
     <tocitem text="Cursor Mode" target="cursor"/>
@@ -34,23 +33,31 @@
 	<tocitem text="Multiple Views" target="multipleviews"/>
 	<tocitem text="Viewing Trees" target="treeviewer" expand="false"/>
 	<tocitem text="Fetching Sequences" target="seqfetch"/>
+	<tocitem text="Nucleic Acid Support" target="nucleicAcids" expand="false">
+		<tocitem text="Viewing RNA structure" target="varna" />
+		<tocitem text="RNA Structure Consensus" target="calcs.alstrconsensus"/>
+		<tocitem text="RNA Helices coloring" target="colours.rnahelices"/>
+	</tocitem>
 	<tocitem text="Sequence Features" target="seqfeatures" expand="false">
           <tocitem text="Sequence Feature Settings" target="seqfeatures.settings"/>
           <tocitem text="Sequence Features File" target="features.fileformat"/>
+          <tocitem text="Feature Colourschemes" target="features.featureschemes"/>
           <tocitem text="User Defined Sequence Features" target="seqfeatcreat"/>
 		  <tocitem text="Editing Sequence Features" target="seqfeatedit"/>
           <tocitem text="DAS Feature Retrieval" target="das.viewing"/>
 	  <tocitem text="DAS Feature Settings" target="das.settings"/>
         </tocitem>
 	<tocitem text="Web Services" target="webservice" expand="false">
-          <tocitem text="Sequence Alignment" target="msaservice" expand="false">
-		<tocitem text="Clustal Alignment" target="clustal"/>
-                <tocitem text="Muscle Alignment" target="muscle"/>
-                <tocitem text="MAFFT Alignment" target="mafft"/>
+	<tocitem text="JABAWS" target="jabaws"/>
+	<tocitem text="Web Service Preferences" target="wsprefs"/>
+	<tocitem text="Web Service Parameters" target="wsparams"/>
+	<tocitem text="Sequence Alignment" target="msaservice" expand="false">
                 <tocitem text="Multiple Alignment Subjobs" target="msaservice"/>
             </tocitem>
           <tocitem text="Secondary Structure Prediction" target="jnet"/>
+          <tocitem text="Multi-Harmony Alignment Analysis" target="shmrws"/>
 		<tocitem text="Sequence Retrieval" target="seqfetch"/>
+		<tocitem text="Database Reference Retrieval" target="dbreffetcher"/>
 		<tocitem text="DAS Feature Retrieval" target="das.viewing"/>
 	</tocitem>
 	<tocitem text="Colour Schemes" target="colours" expand="false">
@@ -64,12 +71,14 @@
 		<tocitem text="Turn propensity" target="colours.turn"/>
 		<tocitem text="Buried index" target="colours.buried"/>
 		<tocitem text="Nucleotide colours" target="colours.nucleotide"/>
+		<tocitem text="Purine/Pyrimidine colours" target="colours.purinepyrimidine"/>
 		<tocitem text="Blosum62" target="colours.blosum"/>
 		<tocitem text="by Percentage Identity" target="colours.pid"/>	
 		<tocitem text="User Defined" target="colours.user"/>
 		<tocitem text="Above Percentage Identity" target="colours.abovepid"/>
 		<tocitem text="By conservation" target="colours.conservation"/>
 		<tocitem text="By Annotation" target="colours.annotation"/>
+		<tocitem text="By RNA Helices" target="colours.rnahelices"/>
 	</tocitem>
 	<tocitem text="Calculations" target="calculations" expand="false">
 		<tocitem text="Sorting alignments" target="sorting"/>
@@ -80,15 +89,17 @@
 		<tocitem text="Remove Redundancy" target="redundancy"/>
 	</tocitem>
   	<tocitem text="Alignment Annotations" target ="alannotation" expand="false">
-          <tocitem text="Conservation" target="calcs.alconserv"/>
+          <tocitem text="Conservation" target="calcs.alconserv"/>          
           <tocitem text="Quality" target="calcs.alquality"/>
           <tocitem text="Consensus" target="calcs.consensus"/>
+          <tocitem text="RNA Structure Consensus" target="calcs.alstrconsensus"/>
           <tocitem text="Annotations File Format" target="annotations.fileformat"/>
         </tocitem>
 	<tocitem text="Viewing PDB Files" target="viewingpdbs" expand="false">
 	  <tocitem text="Jmol Viewer" target="pdbjmol"/>
 	  <tocitem text="Simple PDB Viewer" target="pdbmcviewer"/>
 	</tocitem>
+	<tocitem text="Viewing RNA structures" target="varna" expand="false">	</tocitem>
 	<tocitem text="VAMSAS Data Exchange" target="vamsas">
 		<!-- what can Jalview share with other apps -->
 		<!-- what other apps exist -->
@@ -116,6 +127,7 @@
           <tocitem text="Command Line Arguments" target="clarguments"/>
 	      <tocitem text="Groovy Shell" target="groovy"/>
         </tocitem>
+       	<tocitem text="Privacy" target="privacy"/>
 </tocitem>
 <tocitem text="Useful information" expa nd="true">
 	<tocitem text="Amino Acid Table" target="aminoAcids"/>