merge

[jalview.git] / help / help.jhm

diff --git a/help/help.jhm b/help/help.jhm
index af010a4..a450473 100755 (executable)
--- a/help/help.jhm
+++ b/help/help.jhm
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -74,6 +74,7 @@
    <mapID target="edit" url="html/editing/index.html"/>
    <mapID target="jalarchive" url="html/features/jalarchive.html"/>
    <mapID target="multipleviews" url="html/features/multipleViews.html"/>
+   <mapID target="splitframe" url="html/features/splitView.html"/>
    <mapID target="trees" url="html/calculations/tree.html"/>
    <mapID target="treeviewer" url="html/calculations/treeviewer.html"/>
    <mapID target="sorting" url="html/calculations/sorting.html"/>
@@ -105,7 +106,8 @@
    <mapID target="calcs.alquality" url="html/calculations/quality.html"/>   
    <mapID target="calcs.alconserv" url="html/calculations/conservation.html"/>
    <mapID target="calcs.alstrconsensus" url="html/calculations/structureconsensus.html"/>  
-   <mapID target="calcs.consensus" url="html/calculations/consensus.html"/>
+   <mapID target="calcs.consensus" url="html/calculations/consensus.html"/>   
+   <mapID target="calcs.annotation" url="html/calculations/columnFilterByAnnotation.html"/>
    
    <mapID target="nucleicAcids" url="html/na/index.html"/>