diff --git a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
index 9b2946b..e9d0f36 100644
--- a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.sse.doc.user; singleton:=true
-Bundle-Version: 1.0.203.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
new file mode 100644
index 0000000..10a8886
--- /dev/null
+++ b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en-us" xml:lang="en-us">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
+<meta name="security" content="public" />
+<meta name="Robots" content="index,follow" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta name="DC.Format" content="XHTML" />
+<!-- All rights reserved. Licensed Materials Property of IBM -->
+<!-- US Government Users Restricted Rights -->
+<!-- Use, duplication or disclosure restricted by -->
+<!-- GSA ADP Schedule Contract with IBM Corp. -->
+<link rel="stylesheet" type="text/css" href="ibmdita.css" />
+<title>Index</title>
+</head>
+<body>
+<h1>Index</h1>
+<a name="IDX0_41" href="#IDX1_41">A</a>
+<a name="IDX0_43" href="#IDX1_43">C</a>
+<a name="IDX0_44" href="#IDX1_44">D</a>
+<a name="IDX0_46" href="#IDX1_46">F</a>
+<a name="IDX0_48" href="#IDX1_48">H</a>
+<a name="IDX0_4A" href="#IDX1_4A">J</a>
+<a name="IDX0_4D" href="#IDX1_4D">M</a>
+<a name="IDX0_53" href="#IDX1_53">S</a>
+<a name="IDX0_54" href="#IDX1_54">T</a>
+<a name="IDX0_56" href="#IDX1_56">V</a>
+<a name="IDX0_58" href="#IDX1_58">X</a>
+<hr></hr>
+<strong><a name="IDX1_41" href="#IDX0_41">A</a></strong>
+<ul class="indexlist">
+<li>annotation preferences
+<ul class="indexlist">
+<li><a href="topics/tsrcedt001.html#tsrcedt001">markup language settings</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
+<ul class="indexlist">
+<li>character encoding
+<ul class="indexlist">
+<li><a href="topics/cencoding.html#cencoding">location in files</a>
+</li>
+</ul>
+</li>
+<li>content assistance
+<ul class="indexlist">
+<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling for JSP files</a>
+</li>
+<li><a href="topics/csrcedt006.html#csrcedt006">overview</a>
+</li>
+<li><a href="topics/tsrcedt005.html#tsrcedt005">structured text editors</a>
+</li>
+</ul>
+</li>
+<li>content types
+<ul class="indexlist">
+<li><a href="topics/tcontenttype.html#tcontenttype">mapping file extensions</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
+<ul class="indexlist">
+<li>drawers
+<ul class="indexlist">
+<li><a href="topics/tsrcedt016.html#tsrcedt016">snippets view</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_46" href="#IDX0_46">F</a></strong>
+<ul class="indexlist">
+<li>file extensions
+<ul class="indexlist">
+<li><a href="topics/tcontenttype.html#tcontenttype">mapping content types</a>
+</li>
+</ul>
+</li>
+<li>file types
+<ul class="indexlist">
+<li><a href="topics/tcontenttype.html#tcontenttype">editors</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_48" href="#IDX0_48">H</a></strong>
+<ul class="indexlist">
+<li>HTML
+<ul class="indexlist">
+<li>templates
+<ul class="indexlist">
+<li><a href="topics/tsrcedt024.html#tsrcedt024">adding</a>
+</li>
+<li><a href="topics/tsrcedt024.html#tsrcedt024">removing</a>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
+<ul class="indexlist">
+<li>JSP files
+<ul class="indexlist">
+<li><a href="topics/cencoding.html#cencoding">character encoding</a>
+</li>
+<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling content assistance</a>
+</li>
+</ul>
+</li>
+<li>JSP pages
+<ul class="indexlist">
+<li><a href="topics/tsrcedt028.html#tsrcedt028">templates</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_4D" href="#IDX0_4D">M</a></strong>
+<ul class="indexlist">
+<li>markup languages
+<ul class="indexlist">
+<li><a href="topics/tsrcedt000.html#tsrcedt000">editing text</a>
+</li>
+<li><a href="topics/tsrcedt001.html#tsrcedt001">setting annotation preferences</a>
+</li>
+<li><a href="topics/tsrcedt027.html#tsrcedt027">templates</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_53" href="#IDX0_53">S</a></strong>
+<ul class="indexlist">
+<li>snippet drawers
+<ul class="indexlist">
+<li><a href="topics/tsrcedt015.html#tsrcedt015">adding items</a>
+</li>
+</ul>
+</li>
+<li>snippet items
+<ul class="indexlist">
+<li><a href="topics/tsrcedt015.html#tsrcedt015">adding to drawers</a>
+</li>
+</ul>
+</li>
+<li>snippets
+<ul class="indexlist">
+<li><a href="topics/tsrcedt014.html#tsrcedt014">drawer customization</a>
+</li>
+<li><a href="topics/tsrcedt022.html#tsrcedt022">editing items</a>
+</li>
+<li><a href="topics/tsrcedt016.html#tsrcedt016">modifying drawers</a>
+</li>
+<li><a href="topics/tsrcedt026.html#tsrcedt026">overview</a>
+</li>
+</ul>
+</li>
+<li>Snippets view
+<ul class="indexlist">
+<li><a href="topics/csrcedt001.html#csrcedt001">overview</a>
+</li>
+</ul>
+</li>
+<li>spell check
+<ul class="indexlist">
+<li><a href="topics/tsrcedt010.html#tsrcedt010">structured text editors</a>
+</li>
+</ul>
+</li>
+<li>structured text editors
+<ul class="indexlist">
+<li>content assistance <a href="topics/tsrcedt005.html#tsrcedt005">(1)</a>, <a href="topics/csrcedt006.html#csrcedt006">(2)</a>
+</li>
+<li><a href="topics/csrcedt004.html#csrcedt004">overview</a>
+</li>
+<li><a href="topics/tsrcedt025.html#tsrcedt025">preference setting</a>
+</li>
+<li><a href="topics/tsrcedt010.html#tsrcedt010">spell check</a>
+</li>
+<li><a href="topics/tsrcedt007.html#tsrcedt007">text search</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_54" href="#IDX0_54">T</a></strong>
+<ul class="indexlist">
+<li>templates
+<ul class="indexlist">
+<li><a href="topics/tsrcedt024.html#tsrcedt024">HTML</a>
+</li>
+<li><a href="topics/tsrcedt028.html#tsrcedt028">JSP pages</a>
+</li>
+<li><a href="topics/tsrcedt027.html#tsrcedt027">markup languages</a>
+</li>
+<li><a href="topics/csrcedt004.html#csrcedt004">structured text editors</a>
+</li>
+<li><a href="topics/tsrcedt029.html#tsrcedt027">XML</a>
+</li>
+</ul>
+</li>
+<li>text
+<ul class="indexlist">
+<li><a href="topics/tsrcedt000.html#tsrcedt000">editing in markup languages</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
+<ul class="indexlist">
+<li>validation
+<ul class="indexlist">
+<li><a href="topics/cvalidate.html#csrcedt001">source vs batch</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
+<ul class="indexlist">
+<li>XHTML
+<ul class="indexlist">
+<li><a href="topics/cencoding.html#cencoding">character encoding</a>
+</li>
+</ul>
+</li>
+<li>XML
+<ul class="indexlist">
+<li><a href="topics/cencoding.html#cencoding">character encoding</a>
+</li>
+</ul>
+</li>
+<li>xml templates
+<ul class="indexlist">
+<li><a href="topics/tsrcedt029.html#tsrcedt027">adding</a>
+</li>
+</ul>
+</li>
+</ul>
+</body></html>
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
index ddf48ed..02d9209 100644
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <index>
-  <entry keyword="templates">
-    <entry keyword="adding">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="removing">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="HTML">
-      <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-    </entry>
-    <entry keyword="JSP">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-    <entry keyword="XML">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
-  </entry>
   <entry keyword="structured text editors">
     <entry keyword="overview">
       <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
@@ -24,7 +7,7 @@
     <entry keyword="preference setting">
       <topic href="topics/tsrcedt025.html#tsrcedt025" title="Setting preferences for structured text editors"/>
     </entry>
-    <entry keyword="content assist">
+    <entry keyword="content assistance">
       <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
       <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
     </entry>
@@ -35,25 +18,39 @@
       <topic href="topics/tsrcedt010.html#tsrcedt010" title="Checking spelling"/>
     </entry>
   </entry>
-  <entry keyword="markup languages">
-    <entry keyword="editing">
-      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-    </entry>
+  <entry keyword="templates">
     <entry keyword="structured text editors">
-      <entry keyword="markup language editing">
-        <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-      </entry>
-      <entry keyword="overview">
-        <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-      </entry>
+      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
+    </entry>
+    <entry keyword="markup languages">
+      <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
+    </entry>
+    <entry keyword="HTML">
+      <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
+    </entry>
+    <entry keyword="JSP pages">
+      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
+    </entry>
+    <entry keyword="XML">
+      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
+    </entry>
+  </entry>
+  <entry keyword="markup languages">
+    <entry keyword="editing text">
+      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
     </entry>
     <entry keyword="setting annotation preferences">
       <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
     </entry>
-    <entry keyword="adding and removing templates">
+    <entry keyword="templates">
       <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
     </entry>
   </entry>
+  <entry keyword="text">
+    <entry keyword="editing in markup languages">
+      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
+    </entry>
+  </entry>
   <entry keyword="validation">
     <entry keyword="source vs batch">
       <topic href="topics/cvalidate.html#csrcedt001" title="Source and batch validation"/>
@@ -64,7 +61,7 @@
       <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
     </entry>
   </entry>
-  <entry keyword="content assist">
+  <entry keyword="content assistance">
     <entry keyword="structured text editors">
       <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
     </entry>
@@ -76,27 +73,40 @@
     </entry>
   </entry>
   <entry keyword="JSP files">
-    <entry keyword="content assist enablement">
+    <entry keyword="enabling content assistance">
       <topic href="topics/tsrcedt023.html#tsrcedt023" title="Enabling content assist for JSP files"/>
     </entry>
+    <entry keyword="character encoding">
+      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
+    </entry>
+  </entry>
+  <entry keyword="content types">
+    <entry keyword="mapping file extensions">
+      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
+    </entry>
+  </entry>
+  <entry keyword="file extensions">
+    <entry keyword="mapping content types">
+      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
+    </entry>
   </entry>
   <entry keyword="file types">
     <entry keyword="editors">
       <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
     </entry>
   </entry>
-  <entry keyword="content type">
-    <entry keyword="mapping file extensions">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
+  <entry keyword="character encoding">
+    <entry keyword="location in files">
+      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
     </entry>
   </entry>
-  <entry keyword="file extensions">
-    <entry keyword="mapping content type">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
+  <entry keyword="XHTML">
+    <entry keyword="character encoding">
+      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
     </entry>
   </entry>
-  <entry keyword="encoding">
-    <entry keyword="files">
+  <entry keyword="XML">
+    <entry keyword="character encoding">
       <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
     </entry>
   </entry>
@@ -114,20 +124,9 @@
         <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
       </entry>
     </entry>
-    <entry keyword="editing">
-      <entry keyword="reuse with snippets">
-        <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-      </entry>
-    </entry>
-    <entry keyword="reuse with snippets">
-      <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-    </entry>
   </entry>
-  <entry keyword="JSP templates">
-    <entry keyword="adding">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-    <entry keyword="removing">
+  <entry keyword="JSP pages">
+    <entry keyword="templates">
       <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
     </entry>
   </entry>
@@ -135,59 +134,28 @@
     <entry keyword="adding">
       <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
     </entry>
-    <entry keyword="removing">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
   </entry>
   <entry keyword="snippets">
     <entry keyword="overview">
       <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
     </entry>
-    <entry keyword="drawers">
-      <entry keyword="adding">
-        <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-      </entry>
-      <entry keyword="deleting">
-        <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-      </entry>
-      <entry keyword="editing items">
-        <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-      </entry>
-      <entry keyword="hiding">
-        <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-      </entry>
+    <entry keyword="drawer customization">
+      <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
     </entry>
     <entry keyword="editing items">
       <topic href="topics/tsrcedt022.html#tsrcedt022" title="Editing snippet items"/>
     </entry>
-    <entry keyword="deleting or hiding drawers">
+    <entry keyword="modifying drawers">
       <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
     </entry>
   </entry>
-  <entry keyword="JavaScript">
-    <entry keyword="reuse with snippets">
-      <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP code">
-    <entry keyword="reuse with snippets">
-      <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP tags">
-    <entry keyword="custom">
-      <entry keyword="reuse with snippets">
-        <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-      </entry>
-    </entry>
-  </entry>
   <entry keyword="Snippets view">
     <entry keyword="overview">
       <topic href="topics/csrcedt001.html#csrcedt001" title="Snippets view"/>
     </entry>
   </entry>
   <entry keyword="snippet drawers">
-    <entry keyword="adding items to">
+    <entry keyword="adding items">
       <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
     </entry>
   </entry>
@@ -197,10 +165,7 @@
     </entry>
   </entry>
   <entry keyword="drawers">
-    <entry keyword="deleting snippets">
-      <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
-    </entry>
-    <entry keyword="hiding snippets">
+    <entry keyword="snippets view">
       <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
     </entry>
   </entry>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
index e7ba9c2..c7a7322 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
@@ -6,7 +6,11 @@
 <title>File Encoding</title>
 <shortdesc></shortdesc>
 <prolog><metadata>
-<keywords><indexterm>encoding<indexterm>files</indexterm></indexterm></keywords>
+<keywords><indexterm>character encoding<indexterm>location in files</indexterm></indexterm>
+<indexterm>JSP files<indexterm>character encoding</indexterm></indexterm>
+<indexterm>XHTML<indexterm>character encoding</indexterm></indexterm>
+<indexterm>XML<indexterm>character encoding</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <conbody>
 <p> The character encoding in XML, (X)HTML files, and JSP files can be specified
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
index 21a73d5..de02cbe 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
@@ -14,7 +14,8 @@
 <keywords><keyword>source editors</keyword></keywords>
 </metadata></prolog>
 <conbody>
-<p><indexterm>templates<indexterm>adding</indexterm><indexterm>removing</indexterm></indexterm><indexterm>structured text editors<indexterm>overview</indexterm></indexterm>
+<p><indexterm>structured text editors<indexterm>overview</indexterm></indexterm>
+<indexterm>templates<indexterm>structured text editors</indexterm></indexterm>
 
 The structured text editor is represented by various editors that you can
 use to edit files coded with markup tags:</p>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
index 81d509d..fc9cdf6 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
@@ -9,7 +9,8 @@
 in the source file provides the context for the content assist to offer suggestions
 for completion.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>content assist<indexterm>overview</indexterm></indexterm><indexterm>structured text editors<indexterm>content assist</indexterm></indexterm>
+<keywords><indexterm>content assistance<indexterm>overview</indexterm></indexterm>
+<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>
 
 
 </keywords>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
index fec35a9..c63d1e1 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
@@ -6,7 +6,9 @@
 <title>Associating editors with additional files types</title>
 <shortdesc></shortdesc>
 <prolog><metadata>
-<keywords><indexterm>file types<indexterm>editors</indexterm></indexterm><indexterm>content type<indexterm>mapping file extensions</indexterm></indexterm><indexterm>file extensions<indexterm>mapping content type</indexterm></indexterm>
+<keywords><indexterm>content types<indexterm>mapping file extensions</indexterm></indexterm>
+<indexterm>file extensions<indexterm>mapping content types</indexterm></indexterm>
+<indexterm>file types<indexterm>editors</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
index 8b29a0e..42b7b97 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
@@ -11,7 +11,8 @@
 text editor</term>. This is a generic term for several editors that you can
 use to edit any of several markup languages, such as HTML.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>markup languages<indexterm>editing</indexterm><indexterm>structured text editors<indexterm>markup language editing</indexterm><indexterm>overview</indexterm></indexterm></indexterm>
+<keywords><indexterm>markup languages<indexterm>editing text</indexterm></indexterm>
+<indexterm>text<indexterm>editing in markup languages</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
index 9ff262a..958f2ee 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
@@ -12,8 +12,8 @@
 in a structured text editor. Content assist helps you insert or finish a tag
 or function or finish a line of code in a structured text editor.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>content assist<indexterm>structured text editors</indexterm></indexterm>
-<indexterm>structured text editors<indexterm>content assist</indexterm></indexterm>
+<keywords><indexterm>content assistance<indexterm>structured text editors</indexterm></indexterm>
+<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
index 61521a2..ce2bb1d 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
@@ -7,7 +7,7 @@
 <shortdesc>This documentation explains how to customize the Snippets view
 by adding a new drawer.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>snippets<indexterm>drawers<indexterm>adding</indexterm><indexterm>deleting</indexterm><indexterm>editing items</indexterm><indexterm>hiding</indexterm></indexterm></indexterm>
+<keywords><indexterm>snippets<indexterm>drawer customization</indexterm></indexterm>
 
 </keywords>
 </metadata></prolog>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
index dd7a76d..e1195f9 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
@@ -5,7 +5,7 @@
 <task id="tsrcedt015" xml:lang="en-us">
 <title>Adding items to snippets drawers</title>
 <prolog><metadata>
-<keywords><indexterm>snippet drawers<indexterm>adding items to</indexterm></indexterm>
+<keywords><indexterm>snippet drawers<indexterm>adding items</indexterm></indexterm>
 <indexterm>snippet items<indexterm>adding to drawers</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
index 4c615d6..fd624af 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
@@ -10,7 +10,8 @@
 <shortdesc>This documentation describes how to delete or hide drawers and
 items in the Snippets view.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>snippets<indexterm>deleting or hiding drawers</indexterm></indexterm><indexterm>drawers<indexterm>deleting snippets</indexterm><indexterm>hiding snippets</indexterm></indexterm>
+<keywords><indexterm>drawers<indexterm>snippets view</indexterm></indexterm>
+<indexterm>snippets<indexterm>modifying drawers</indexterm></indexterm>
 
 
 </keywords>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
index 30a45ea..0bd8065 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
@@ -11,7 +11,8 @@
 tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans
 in JSP and HTML files.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>JSP files<indexterm>content assist enablement</indexterm></indexterm><indexterm>content assist<indexterm>enabling for JSP files</indexterm></indexterm>
+<keywords><indexterm>content assistance<indexterm>enabling for JSP files</indexterm></indexterm>
+<indexterm>JSP files<indexterm>enabling content assistance</indexterm></indexterm>
 
 
 </keywords>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
index 2f0e42e..d7cf927 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
@@ -10,7 +10,7 @@
 files and custom JSP tags. The view can be extended based on additional objects
 that you define and include.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>snippets<indexterm>overview</indexterm></indexterm><indexterm>HTML<indexterm>editing<indexterm>reuse with snippets</indexterm></indexterm></indexterm><indexterm>JavaScript<indexterm>reuse with snippets</indexterm></indexterm><indexterm>JSP code<indexterm>reuse with snippets</indexterm></indexterm><indexterm>JSP tags<indexterm>custom<indexterm>reuse with snippets</indexterm></indexterm></indexterm><indexterm>HTML<indexterm>reuse with snippets</indexterm></indexterm>
+<keywords><indexterm>snippets<indexterm>overview</indexterm></indexterm>
 
 
 
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
index 27c95f9..7d324eb 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
@@ -11,7 +11,8 @@
 that you can insert into a file. You can use the default templates as provided,
 customize the default templates, or create your own templates.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>markup languages<indexterm>adding and removing templates</indexterm></indexterm>
+<keywords><indexterm>markup languages<indexterm>templates</indexterm></indexterm>
+<indexterm>templates<indexterm>markup languages</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
index ae33258..cb9bc26 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
@@ -8,7 +8,8 @@
 code, that you can insert into a file. You can use the default templates as
 provided, customize the default templates, or create your own templates.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>JSP templates<indexterm>adding</indexterm><indexterm>removing</indexterm></indexterm><indexterm>templates<indexterm>JSP</indexterm></indexterm>
+<keywords><indexterm>JSP pages<indexterm>templates</indexterm></indexterm>
+<indexterm>templates<indexterm>JSP pages</indexterm></indexterm>
 
 </keywords>
 </metadata></prolog>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
index da51749..e41bd7c 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
@@ -9,7 +9,8 @@
 code that you can insert into a file. You can use the default template as
 provided, customize that template, or create your own templates.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>xml templates<indexterm>adding</indexterm><indexterm>removing</indexterm></indexterm><indexterm>templates<indexterm>XML</indexterm></indexterm>
+<keywords><indexterm>templates<indexterm>XML</indexterm></indexterm>
+<indexterm>xml templates<indexterm>adding</indexterm></indexterm>
 
 
 </keywords>