merge commit

[jalview.git] / help / help.jhm

diff --git a/help/help.jhm b/help/help.jhm
index b199dbf..b6b0063 100755 (executable)
--- a/help/help.jhm
+++ b/help/help.jhm
@@ -39,6 +39,7 @@
    <mapID target="disorder" url="html/webServices/proteinDisorder.html"/>
    <mapID target="aacon" url="html/webServices/AACon.html"/>
    <mapID target="rnaalifold" url="html/webServices/RNAalifold.html"/>
+   <mapID target="seqannots" url="html/features/annotation.html#seqannots"/>
    <mapID target="seqfetch" url="html/features/seqfetch.html"/>
    <mapID target="dbreffetcher" url="html/webServices/dbreffetcher.html"/>
    <mapID target="seqmappings" url="html/features/seqmappings.html"/>
@@ -52,7 +53,9 @@
    <mapID target="viewingpdbs.reps" url="html/features/viewingpdbs.html#viewreps"/>
    <mapID target="pdbmcviewer" url="html/features/pdbviewer.html"/>
    <mapID target="pdbjmol" url="html/features/jmol.html"/>
+   <mapID target="chimera" url="html/features/chimera.html"/>
    <mapID target="varna" url="html/features/varna.html"/>
+   <mapID target="xsspannotation" url="html/features/xsspannotation.html"/>
    <mapID target="preferences" url="html/features/preferences.html"/>     
    <mapID target="commandline" url="html/features/commandline.html"/>
    <mapID target="clarguments" url="html/features/clarguments.html"/>
@@ -112,13 +115,14 @@
    <mapID target="alwEdit" url="html/menus/alwedit.html"/>
    <mapID target="alwSelect" url="html/menus/alwselect.html"/>
    <mapID target="alwView" url="html/menus/alwview.html"/>
+   <mapID target="alwAnnotations" url="html/menus/alwannotation.html"/>
    <mapID target="alwFormat" url="html/menus/alwformat.html"/>
    <mapID target="alwColour" url="html/menus/alwcolour.html"/>
    <mapID target="alwCalc" url="html/menus/alwcalculate.html"/>
    
    <mapID target="wsMenu" url="html/menus/wsmenu.html"/>
    <mapID target="popMenu" url="html/menus/popupMenu.html"/>
-   <mapID target="annotMenus" url="html/menus/alwannotations.html"/>
+   <mapID target="annotPanelMenu" url="html/menus/alwannotationpanel.html"/>
    
    <mapID target="memory" url="html/memory.html" />
    <mapID target="jalviewjnlp" url="html/jalviewjnlp.html" />