[231596] Docs. Index updates. Pre-built search index.
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml
new file mode 100644
index 0000000..ebdd30a
--- /dev/null
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc topic="topics/tcretdtd.html">
+<topic label="Creating DTDs" href="topics/tcretdtd.html"/>
+<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
+<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
+<topic label="Validating DTDs" href="topics/tvaldtd.html"/>
+<topic label="Creating DTDs" href="topics/tcretdtd.html"/>
+<topic label="Working with DTD templates" href="topics/tdtemplt.html"/>
+</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
index 69f3f74..0bd733b 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
@@ -51,7 +51,7 @@
 			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
 			<property name="args.eclipse.provider" value="Eclipse.org" />
 			<property name="args.eclipse.version" value="3.3.0" />
-			<property name="args.input" location="DTDEditormap_toc.ditamap" />    		
+			<property name="args.input" location="DTDreftable.ditamap" />    		
 			<property name="clean.temp" value="true" />
 			<property name="dita.extname" value=".dita" />
 			<property name="dita.temp.dir" location="temp" />
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs
deleted file mode 100644
index 0f963ab..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_8.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs
new file mode 100644
index 0000000..f58c91c
--- /dev/null
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
index 92fe3c5..ba1ac26 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-org.eclipse.wst.dtdeditor.doc.user=org.eclipse.wst.dtdeditor.doc.user\n1.0.300.qualifier

+#Wed May 14 18:24:20 EDT 2008

+org.eclipse.wst.dtdeditor.doc.user=org.eclipse.wst.dtdeditor.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
index 771ea1c..e8b167f 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

+#Wed May 14 18:24:20 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
index af1ba6a..ec8f737 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
@@ -1,10 +1,11 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:14:27 EDT 2007

-/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html=0

+#Wed May 14 18:24:20 EDT 2008

+/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html=0

 /org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html=0

+/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html=0

 /org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html=0

+/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html=0

 /org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html=0

+/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html=0

+/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html=0

+/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html=0

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments b/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
index 19b5d0c..aa86d60 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
index 1f7b7fb..aabd7bb 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
@@ -19,4 +19,7 @@
 	<extension point="org.eclipse.help.index">
 		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
 	</extension>
+	<extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
index ce9760d..badab2e 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <index>
-  <entry keyword="DTD">
+  <entry keyword="DTDs">
     <entry keyword="creating">
       <topic href="topics/tcretdtd.html#tcretdtd" title="Creating DTDs"/>
     </entry>
@@ -16,9 +16,6 @@
     <entry keyword="importing">
       <topic href="topics/timptdtd.html#timptdtd" title="Importing DTDs"/>
     </entry>
-    <entry keyword="validating">
-      <topic href="topics/tvaldtd.html#tvaldtd" title="Validating DTDs"/>
-    </entry>
     <entry keyword="editor icons">
       <topic href="topics/rdtdicons.html#ricons" title="Icons used in the DTD editor"/>
     </entry>
@@ -33,4 +30,19 @@
       <topic href="topics/tdtemplt.html#twmacro" title="Working with DTD templates"/>
     </entry>
   </entry>
+  <entry keyword="DTD">
+    <entry keyword="validating">
+      <topic href="topics/tvaldtd.html#tvaldtd" title="Validating DTDs"/>
+    </entry>
+  </entry>
+  <entry keyword="DTD editor">
+    <entry keyword="keyboard shortcuts">
+      <topic href="topics/rdtdkey.html#keyboardshortcutsinthedtdeditor" title="DTD editor keyboard shortcuts"/>
+    </entry>
+  </entry>
+  <entry keyword="keyboard shortcuts">
+    <entry keyword="DTD editor">
+      <topic href="topics/rdtdkey.html#keyboardshortcutsinthedtdeditor" title="DTD editor keyboard shortcuts"/>
+    </entry>
+  </entry>
 </index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
index 1f7b7fb..aabd7bb 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
@@ -19,4 +19,7 @@
 	<extension point="org.eclipse.help.index">
 		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
 	</extension>
+	<extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
index a81aa1b..930a999 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
@@ -2,7 +2,7 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

-<concept id="cdtdover" xml:lang="en-us"><?Pub Caret1?>

+<concept id="cdtdover" xml:lang="en-us">

 <title>Document type definitions (DTDs) - overview</title>

 <titlealts>

 <searchtitle>Document type definition (DTD) - overview</searchtitle>

@@ -12,7 +12,7 @@
 can specify rules that control the structure of any XML files that reference

 the DTD file.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>overview</indexterm></indexterm></keywords>

+<keywords><indexterm>DTDs<indexterm>overview</indexterm></indexterm></keywords>

 </metadata></prolog>

 <conbody>

 <p>A DTD can contain declarations that define elements, attributes, notations,

@@ -31,4 +31,3 @@
 XML file against the DTD.</p>

 </conbody>

 </concept>

-<?Pub *0000001753?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
index f5fe237..48a95ff 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
@@ -11,9 +11,9 @@
 <meta name="DC.Title" content="Document type definitions (DTDs) - overview" />
 <meta name="abstract" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
 <meta name="description" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
-<meta content="DTD, overview" name="DC.subject" />
-<meta content="DTD, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
+<meta content="DTDs, overview" name="DC.subject" />
+<meta content="DTDs, overview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tvaldtd.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cdtdover" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -52,9 +52,8 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tvaldtd.html" title="Validating a DTD file lets you verify that it is well formed and does not contain any errors.">Validating DTDs</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
index 003c581..b5a3e19 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

+<!--Arbortext, Inc., 1988-2006, v.4002-->

+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

+ "reference.dtd">

 <reference id="ricons" xml:lang="en-us">

 <title>Icons used in the DTD editor</title>

 <titlealts>

@@ -8,8 +9,7 @@
 </titlealts>

 <shortdesc>These DTD editor icons appear in the Outline view.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>editor icons</indexterm></indexterm>

-</keywords>

+<keywords><indexterm>DTDs<indexterm>editor icons</indexterm></indexterm></keywords>

 </metadata></prolog>

 <refbody>

 <table>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
index 61b82cc..180b394 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Icons used in the DTD editor" />
 <meta name="abstract" content="These DTD editor icons appear in the Outline view." />
 <meta name="description" content="These DTD editor icons appear in the Outline view." />
-<meta content="DTD, editor icons" name="DC.subject" />
-<meta content="DTD, editor icons" name="keywords" />
+<meta content="DTDs, editor icons" name="DC.subject" />
+<meta content="DTDs, editor icons" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="ricons" name="DC.Identifier" />
@@ -34,9 +34,9 @@
 <div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
 <thead align="left">
 <tr>
-<th valign="top" id="N10064">Icon </th>
+<th valign="top" id="N10063">Icon </th>
 
-<th valign="top" id="N1006B">Description</th>
+<th valign="top" id="N1006A">Description</th>
 
 </tr>
 
@@ -44,86 +44,86 @@
 
 <tbody>
 <tr>
-<td valign="top" headers="N10064 ">&nbsp;</td>
+<td valign="top" headers="N10063 ">&nbsp;</td>
 
-<td valign="top" headers="N1006B ">&nbsp;</td>
+<td valign="top" headers="N1006A ">&nbsp;</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "> <img src="../images/nany.gif" alt="This graphic is the ANY content&#10;icon" /> </td>
+<td valign="top" headers="N10063 "> <img src="../images/nany.gif" alt="This graphic is the ANY content&#10;icon" /> </td>
 
-<td valign="top" headers="N1006B ">ANY content (content model)</td>
+<td valign="top" headers="N1006A ">ANY content (content model)</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/attribute.gif" alt="This graphic is the attribute&#10;icon" /> </td>
+<td valign="top" headers="N10063 "><img src="../images/attribute.gif" alt="This graphic is the attribute&#10;icon" /> </td>
 
-<td valign="top" headers="N1006B ">attribute</td>
+<td valign="top" headers="N1006A ">attribute</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/attribute_list.gif" alt="This graphic is the&#10;attribute list icon" /> </td>
+<td valign="top" headers="N10063 "><img src="../images/attribute_list.gif" alt="This graphic is the&#10;attribute list icon" /> </td>
 
-<td valign="top" headers="N1006B ">attribute list</td>
+<td valign="top" headers="N1006A ">attribute list</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/ADD_Comment.gif" alt="This&#10;graphic is the comment icon" /></td>
+<td valign="top" headers="N10063 "><img src="../images/ADD_Comment.gif" alt="This&#10;graphic is the comment icon" /></td>
 
-<td valign="top" headers="N1006B ">comment</td>
+<td valign="top" headers="N1006A ">comment</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "> <img src="../images/XSDChoice.gif" alt="This graphic is the content&#10;model - choice icon" /></td>
+<td valign="top" headers="N10063 "> <img src="../images/XSDChoice.gif" alt="This graphic is the content&#10;model - choice icon" /></td>
 
-<td valign="top" headers="N1006B ">content model - choice</td>
+<td valign="top" headers="N1006A ">content model - choice</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "> <img src="../images/XSDSequence.gif" alt="This graphic is the content&#10;model - sequence icon" /></td>
+<td valign="top" headers="N10063 "> <img src="../images/XSDSequence.gif" alt="This graphic is the content&#10;model - sequence icon" /></td>
 
-<td valign="top" headers="N1006B ">content model - sequence</td>
+<td valign="top" headers="N1006A ">content model - sequence</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/ADD_Element.gif" alt="This graphic is the element&#10;icon" /> </td>
+<td valign="top" headers="N10063 "><img src="../images/ADD_Element.gif" alt="This graphic is the element&#10;icon" /> </td>
 
-<td valign="top" headers="N1006B ">element</td>
+<td valign="top" headers="N1006A ">element</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "> <img src="../images/nempty.gif" alt="This graphic is the EMPTY&#10;content (content model) icon" /> </td>
+<td valign="top" headers="N10063 "> <img src="../images/nempty.gif" alt="This graphic is the EMPTY&#10;content (content model) icon" /> </td>
 
-<td valign="top" headers="N1006B ">EMPTY content (content model)</td>
+<td valign="top" headers="N1006A ">EMPTY content (content model)</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/ADD_Entity.gif" alt="This graphic is the entity&#10;icon" /> </td>
+<td valign="top" headers="N10063 "><img src="../images/ADD_Entity.gif" alt="This graphic is the entity&#10;icon" /> </td>
 
-<td valign="top" headers="N1006B ">entity</td>
+<td valign="top" headers="N1006A ">entity</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "><img src="../images/ADD_Notation.gif" alt="This graphic is the notation&#10;icon" /> </td>
+<td valign="top" headers="N10063 "><img src="../images/ADD_Notation.gif" alt="This graphic is the notation&#10;icon" /> </td>
 
-<td valign="top" headers="N1006B ">notation</td>
+<td valign="top" headers="N1006A ">notation</td>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N10064 "> <img src="../images/ADD_Entity_Reference.gif" alt="This graphic&#10;is the parameter entity reference icon" /></td>
+<td valign="top" headers="N10063 "> <img src="../images/ADD_Entity_Reference.gif" alt="This graphic&#10;is the parameter entity reference icon" /></td>
 
-<td valign="top" headers="N1006B ">parameter entity reference</td>
+<td valign="top" headers="N1006A ">parameter entity reference</td>
 
 </tr>
 
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita
index d875cca..6357fa4 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>

 <!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

+ "reference.dtd">

 <reference id="keyboardshortcutsinthedtdeditor" xml:lang="en-us">

-<title outputclass="id_title">DTD editor keyboard shortcuts<?Pub Caret?></title>

+<title outputclass="id_title">DTD editor keyboard shortcuts</title>

 <shortdesc outputclass="id_shortdesc"></shortdesc>

 <prolog><metadata>

-<keywords></keywords>

+<keywords><indexterm>DTD editor<indexterm>keyboard shortcuts</indexterm></indexterm>

+<indexterm>keyboard shortcuts<indexterm>DTD editor</indexterm></indexterm>

+</keywords>

 </metadata></prolog>

 <refbody>

 <table frame="all">

-<tgroup cols="2">

-<?PubTbl tgroup dispwid="680.00px"?>

-<colspec colname="col1" colwidth="84*"/><colspec colname="col3" colwidth="93*"/>

+<tgroup cols="2"><colspec colname="col1" colwidth="84*"/><colspec colname="col3"

+colwidth="93*"/>

 <thead>

 <row valign="bottom">

 <entry colname="col1">Key Combination</entry>

@@ -44,4 +46,3 @@
 </table>

 </refbody>

 </reference>

-<?Pub *0000001431?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html
index 8d672e3..1c0a656 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html
@@ -11,6 +11,8 @@
 <meta name="DC.Title" content="DTD editor keyboard shortcuts" />
 <meta name="abstract" content="" />
 <meta name="description" content="" />
+<meta content="DTD editor, keyboard shortcuts" name="DC.subject" />
+<meta content="DTD editor, keyboard shortcuts" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="keyboardshortcutsinthedtdeditor" name="DC.Identifier" />
@@ -29,13 +31,11 @@
 
 
 <div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-
 <thead align="left">
 <tr valign="bottom">
-<th valign="bottom" width="47.45762711864407%" id="N10053">Key Combination</th>
+<th valign="bottom" width="47.45762711864407%" id="N10068">Key Combination</th>
 
-<th valign="bottom" width="52.54237288135594%" id="N1005A">Function</th>
+<th valign="bottom" width="52.54237288135594%" id="N1006F">Function</th>
 
 </tr>
 
@@ -43,37 +43,37 @@
 
 <tbody>
 <tr>
-<td valign="top" width="47.45762711864407%" headers="N10053 ">Shift+Alt+Up Arrow</td>
+<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Up Arrow</td>
 
-<td valign="top" width="52.54237288135594%" headers="N1005A ">Expand selection to enclosing element</td>
+<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to enclosing element</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="47.45762711864407%" headers="N10053 ">Shift+Alt+Right Arrow</td>
+<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Right Arrow</td>
 
-<td valign="top" width="52.54237288135594%" headers="N1005A ">Expand selection to next element</td>
+<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to next element</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="47.45762711864407%" headers="N10053 ">Shift+Alt+Left Arrow</td>
+<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Left Arrow</td>
 
-<td valign="top" width="52.54237288135594%" headers="N1005A ">Expand selection to previous element</td>
+<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to previous element</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="47.45762711864407%" headers="N10053 ">Shift+Alt+Down Arrow</td>
+<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Down Arrow</td>
 
-<td valign="top" width="52.54237288135594%" headers="N1005A ">Restore last selection</td>
+<td valign="top" width="52.54237288135594%" headers="N1006F ">Restore last selection</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="47.45762711864407%" headers="N10053 ">Ctrl+Shift+P</td>
+<td valign="top" width="47.45762711864407%" headers="N10068 ">Ctrl+Shift+P</td>
 
-<td valign="top" width="52.54237288135594%" headers="N1005A ">Go to matching bracket</td>
+<td valign="top" width="52.54237288135594%" headers="N1006F ">Go to matching bracket</td>
 
 </tr>
 
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
index ae347b4..7af8ce3 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
@@ -2,7 +2,6 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "task.dtd">

-<?Pub Inc?>

 <task id="tcretdtd" xml:lang="en-us">

 <title>Creating DTDs</title>

 <titlealts>

@@ -14,15 +13,14 @@
 and notations, and how they can be used for any XML files that reference the

 DTD file.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>creating</indexterm></indexterm></keywords>

+<keywords><indexterm>DTDs<indexterm>creating</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

-<context><p></p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-create a new DTD, complete the following steps:</p></context>

+<context><p>The following instructions were written for the Resource perspective,

+but they will also work in many other perspectives.</p><p>To create a new

+DTD, complete the following steps:</p></context>

 <steps>

-<step><cmd>Create a project to contain the DTD if needed<?Pub Caret?>.</cmd>

-</step>

+<step><cmd>Create a project to contain the DTD if needed.</cmd></step>

 <step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>

 <uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade> and select <menucascade>

 <uicontrol>XML</uicontrol><uicontrol> DTD</uicontrol></menucascade>. Click <uicontrol>Next</uicontrol>. </cmd>

@@ -45,4 +43,3 @@
 Navigator view.</p></result>

 </taskbody>

 </task>

-<?Pub *0000002420?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
index 8746881..3bb6932 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
@@ -11,9 +11,10 @@
 <meta name="DC.Title" content="Creating DTDs" />
 <meta name="abstract" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
 <meta name="description" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
-<meta content="DTD, creating" name="DC.subject" />
-<meta content="DTD, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
+<meta content="DTDs, creating" name="DC.subject" />
+<meta content="DTDs, creating" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cdtdover.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdtemplt.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tcretdtd" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -34,16 +35,14 @@
 and notations, and how they can be used for any XML files that reference the
 DTD file.</p>
 
-<div class="section"><p />
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-create a new DTD, complete the following steps:</p>
+<div class="section"><p>The following instructions were written for the Resource perspective,
+but they will also work in many other perspectives.</p>
+<p>To create a new
+DTD, complete the following steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>Create a project to contain the DTD if needed.</span>
-</li>
+<li class="stepexpand"><span>Create a project to contain the DTD if needed.</span></li>
 
 <li class="stepexpand"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
  &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span></span> and select <span class="menucascade">
@@ -76,9 +75,11 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tdtemplt.html" title="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with DTD templates</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
index a1de3ba..47a267a 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
@@ -12,7 +12,7 @@
 a certain piece of code you want to reuse several times, and you do not want

 to write it out every time.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>creating templates</indexterm></indexterm>

+<keywords><indexterm>DTDs<indexterm>creating templates</indexterm></indexterm>

 <indexterm>templates<indexterm>DTD</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

@@ -41,7 +41,6 @@
 <postreq>You can edit, remove, import, or export a template by using the same

 preferences page. <p>If you have a template that you do not want to remove,

 but you no longer want the template to appear in the DTD templates list when

-you create a file, clear its checkbox in the templates table<?Pub Caret?>.</p></postreq>

+you create a file, clear its checkbox in the templates table.</p></postreq>

 </taskbody>

 </task>

-<?Pub *0000002424?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
index 1cafc39..fae541b 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Working with DTD templates" />
 <meta name="abstract" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
 <meta name="description" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="DTD, creating templates, templates" name="DC.subject" />
-<meta content="DTD, creating templates, templates" name="keywords" />
+<meta content="DTDs, creating templates, templates, DTD" name="DC.subject" />
+<meta content="DTDs, creating templates, templates, DTD" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twmacro" name="DC.Identifier" />
@@ -73,9 +73,8 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
index 89feb15..5442f67 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
@@ -11,7 +11,7 @@
 code is displayed in the Source view of the DTD editor, such as the colors

 the tags will be displayed in.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>highlighting styles</indexterm></indexterm>

+<keywords><indexterm>DTDs<indexterm>highlighting styles</indexterm></indexterm>

 <indexterm>XML editor<indexterm>DTD highlighting styles</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

@@ -37,7 +37,7 @@
 options. </cmd></step>

 <step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting

 styles back to their default values. If you only want to reset the value for

-a particular content type, select it in the <uicontrol>Content type<?Pub Caret?></uicontrol> field,

+a particular content type, select it in the <uicontrol>Content type</uicontrol> field,

 the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>

 </step>

 <step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>

@@ -45,4 +45,3 @@
 <result></result>

 </taskbody>

 </task>

-<?Pub *0000002412?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
index d3fb9a3..817521a 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Setting source highlighting styles" />
 <meta name="abstract" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
 <meta name="description" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
-<meta content="DTD, highlighting styles, XML editor, DTD highlighting styles" name="DC.subject" />
-<meta content="DTD, highlighting styles, XML editor, DTD highlighting styles" name="keywords" />
+<meta content="DTDs, highlighting styles, XML editor, DTD highlighting styles" name="DC.subject" />
+<meta content="DTDs, highlighting styles, XML editor, DTD highlighting styles" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="ttaghilt" name="DC.Identifier" />
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
index 32d7538..937590b 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
@@ -11,7 +11,7 @@
 the product, you can import them into the workbench and open them in the DTD

 editor. </shortdesc>

 <prolog><metadata>

-<keywords><indexterm>DTD<indexterm>importing</indexterm></indexterm></keywords>

+<keywords><indexterm>DTDs<indexterm>importing</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context><p>To import a DTD into the workbench, complete the following steps:</p></context>

@@ -23,7 +23,7 @@
 <step><cmd>Fill in the fields in the <uicontrol>Import</uicontrol> wizard

 as necessary.</cmd></step>

 <step><cmd>Click <uicontrol>Finish</uicontrol> to exit the wizard and import

-the files<?Pub Caret?>.</cmd></step>

+the files.</cmd></step>

 <step><cmd>Select the DTD file in the Navigator view and double-click it to

 open it in the DTD editor.</cmd></step>

 </steps>

@@ -31,4 +31,3 @@
 it in the DTD editor, you can edit it manually.</p></result>

 </taskbody>

 </task>

-<?Pub *0000001456?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
index f0f0bcd..e813eb1 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Importing DTDs" />
 <meta name="abstract" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
 <meta name="description" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
-<meta content="DTD, importing" name="DC.subject" />
-<meta content="DTD, importing" name="keywords" />
+<meta content="DTDs, importing" name="DC.subject" />
+<meta content="DTDs, importing" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="timptdtd" name="DC.Identifier" />
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
index cf44931..3e9bcf1 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
@@ -28,12 +28,12 @@
 properties so that different types of project resources are automatically

 validated when you save them. Right click on the project, click <uicontrol>Properties</uicontrol>,

 and select <uicontrol>Validation</uicontrol>. Any validators you can run against

-your&nbsp;project<?Pub Caret?> will be listed in the Validation page.&nbsp;</p></result>

+your&nbsp;project will be listed in the Validation page.</p></result>

 </taskbody>

 <related-links>

 <link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

+<linktext>Validating code in enterprise applications</linktext>

 <desc>General validation information</desc>

 </link>

 </related-links>

 </task>

-<?Pub *0000002030?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
index 7c6e64d..1b92ea3 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
@@ -13,7 +13,6 @@
 <meta name="description" content="Validating a DTD file lets you verify that it is well formed and does not contain any errors." />
 <meta content="DTD, validating" name="DC.subject" />
 <meta content="DTD, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
 <meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tvaldtd" name="DC.Identifier" />
@@ -51,17 +50,13 @@
 properties so that different types of project resources are automatically
 validated when you save them. Right click on the project, click <span class="uicontrol">Properties</span>,
 and select <span class="uicontrol">Validation</span>. Any validators you can run against
-your project will be listed in the Validation page. </p>
+your project will be listed in the Validation page.</p>
 </div>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html</a></div>
+<div><div class="relinfo"><strong>Related information</strong><br />
+<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">Validating code in enterprise applications</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml b/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
index d8406e0..1a18684 100644
--- a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
@@ -21,7 +21,9 @@
 	ChangeLog:
 	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
 	- Created.
-
+	2008-05-05 Kate Price <katep@ca.ibm.com>
+	- modified to add generation of pre-built help index. 
+	- Must delete /index folder before running build
 -->
 <project name="eclipsehelp" default="all">
 
@@ -44,16 +46,19 @@
 	<target name="eclipsehelp">
 		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
 			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
+			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
 			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="1.5.0" />
+			<property name="args.eclipse.version" value="3.3.0" />
 			<property name="args.input" location="sse_toc.ditamap" />    		
 			<property name="clean.temp" value="true" />
 			<property name="dita.extname" value=".dita" />
 			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location=".." />
+			<property name="output.dir" location="" />
 			<property name="transtype" value="eclipsehelp" />
 		</ant>
 		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
 	</target>
+	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
+	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
+	</target>
 </project>
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs b/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
index ac3ffd2..ca41649 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
+++ b/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/deletable b/docs/org.eclipse.wst.sse.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.sse.doc.user/index/deletable
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
index 1207a6c..6ba76dc 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

-org.eclipse.wst.sse.doc.user=org.eclipse.wst.sse.doc.user\n1.0.300.qualifier

+#Wed May 14 18:56:03 EDT 2008

+org.eclipse.wst.sse.doc.user=org.eclipse.wst.sse.doc.user\n1.1.0.qualifier

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
index 2810719..d2c7a64 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

+#Wed May 14 18:56:03 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs b/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
index ef97094..885cd48 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
@@ -1,5 +1,5 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:03 EDT 2007

+#Wed May 14 18:56:03 EDT 2008

 /org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html=0

 /org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html=0

 /org.eclipse.wst.sse.doc.user/topics/tcontenttype.html=0

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/segments b/docs/org.eclipse.wst.sse.doc.user/index/segments
index 19b5d0c..2d63c4c 100644
--- a/docs/org.eclipse.wst.sse.doc.user/index/segments
+++ b/docs/org.eclipse.wst.sse.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml b/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
index a994293..4715def 100644
--- a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
@@ -19,11 +19,13 @@
 <plugin>
 
     <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml">
+      <toc file="sse_toc.xml"/>
        <index path="index/"/>
-      </toc>
    </extension>
 	<extension point="org.eclipse.help.index">
       <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
 </extension>
+<extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
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 02d9209..9723ac5 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
@@ -4,12 +4,16 @@
     <entry keyword="overview">
       <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
     </entry>
-    <entry keyword="preference setting">
+    <entry keyword="preferences">
       <topic href="topics/tsrcedt025.html#tsrcedt025" title="Setting preferences for structured text editors"/>
     </entry>
     <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 keyword="text editors">
+        <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
+      </entry>
+      <entry keyword="overview">
+        <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
+      </entry>
     </entry>
     <entry keyword="text search">
       <topic href="topics/tsrcedt007.html#tsrcedt007" title="Searching or finding text within a file"/>
@@ -52,11 +56,11 @@
     </entry>
   </entry>
   <entry keyword="validation">
-    <entry keyword="source vs batch">
+    <entry keyword="source versus batch">
       <topic href="topics/cvalidate.html#csrcedt001" title="Source and batch validation"/>
     </entry>
   </entry>
-  <entry keyword="annotation preferences">
+  <entry keyword="annotations">
     <entry keyword="markup language settings">
       <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
     </entry>
@@ -79,6 +83,9 @@
     <entry keyword="character encoding">
       <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
     </entry>
+    <entry keyword="templates">
+      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
+    </entry>
   </entry>
   <entry keyword="content types">
     <entry keyword="mapping file extensions">
@@ -109,6 +116,9 @@
     <entry keyword="character encoding">
       <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
     </entry>
+    <entry keyword="adding templates">
+      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
+    </entry>
   </entry>
   <entry keyword="spell check">
     <entry keyword="structured text editors">
@@ -125,16 +135,6 @@
       </entry>
     </entry>
   </entry>
-  <entry keyword="JSP pages">
-    <entry keyword="templates">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-  </entry>
-  <entry keyword="xml templates">
-    <entry keyword="adding">
-      <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"/>
@@ -142,6 +142,9 @@
     <entry keyword="drawer customization">
       <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
     </entry>
+    <entry keyword="drawers">
+      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
+    </entry>
     <entry keyword="editing items">
       <topic href="topics/tsrcedt022.html#tsrcedt022" title="Editing snippet items"/>
     </entry>
@@ -154,16 +157,6 @@
       <topic href="topics/csrcedt001.html#csrcedt001" title="Snippets view"/>
     </entry>
   </entry>
-  <entry keyword="snippet drawers">
-    <entry keyword="adding items">
-      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
-    </entry>
-  </entry>
-  <entry keyword="snippet items">
-    <entry keyword="adding to drawers">
-      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
-    </entry>
-  </entry>
   <entry keyword="drawers">
     <entry keyword="snippets view">
       <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.xml b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
index ebbb6bd..4715def 100644
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
@@ -21,8 +21,11 @@
     <extension point="org.eclipse.help.toc">
       <toc file="sse_toc.xml"/>
        <index path="index/"/>
-       </extension>
+   </extension>
 	<extension point="org.eclipse.help.index">
       <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
 </extension>
+<extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
index 36f3b7f..b5707a1 100644
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
@@ -1,42 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Structured text editors" topics="topics/csrcedt004.html">
-   <topic label="Structured text editors" href="topics/csrcedt004.html">
-      <topic label="Editing text coded in markup languages " href="topics/tsrcedt000.html">
-         <topic label="Source and batch validation" href="topics/cvalidate.html"/>
-         <topic label="Setting preferences for structured text editors" href="topics/tsrcedt025.html">
-            <topic label="Setting annotation preferences for markup languages" href="topics/tsrcedt001.html"/>
-         </topic>
-         <topic label="Getting content assistance in structured text editors" href="topics/tsrcedt005.html">
-            <topic label="Content assist" href="topics/csrcedt006.html"/>
-            <topic label="Making content assist work for JSP files" href="topics/tsrcedt023.html"/>
-         </topic>
-         <topic label="Associating editors with file types" href="topics/tcontenttype.html"/>
-         <topic label="File Encoding" href="topics/cencoding.html"/>
-         <topic label="Searching or finding text within a file" href="topics/tsrcedt007.html"/>
-         <topic label="Checking spelling" href="topics/tsrcedt010.html"/>
-         <topic label="Adding and removing markup language templates - overview" href="topics/tsrcedt027.html">
-            <topic label="Adding and removing HTML templates" href="topics/tsrcedt024.html"/>
-            <topic label="Adding and removing JSP templates" href="topics/tsrcedt028.html"/>
-            <topic label="Adding and removing XML templates" href="topics/tsrcedt029.html"/>
-         </topic>
-         <topic label="Editing with snippets - overview" href="topics/tsrcedt026.html">
-            <topic label="Snippets view" href="topics/csrcedt001.html"/>
-            <topic label="Adding snippets drawers" href="topics/tsrcedt014.html"/>
-            <topic label="Adding items to snippets drawers" href="topics/tsrcedt015.html"/>
-            <topic label="Editing snippet items" href="topics/tsrcedt022.html"/>
-            <topic label="Deleting or hiding snippet items or drawers" href="topics/tsrcedt016.html"/>
-         </topic>
-      </topic>
-   </topic>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Editing text coded in markup languages - overview" topic="topics/csrcedt004.html">
+<topic label="Structured text editors" href="topics/csrcedt004.html">
+<topic label="Editing text coded in markup languages " href="topics/tsrcedt000.html">
+<topic label="Source and batch validation" href="topics/cvalidate.html"/>
+<topic label="Setting preferences for structured text editors" href="topics/tsrcedt025.html">
+<topic label="Setting annotation preferences for markup languages" href="topics/tsrcedt001.html"/>
+</topic>
+<topic label="Getting content assistance in structured text editors" href="topics/tsrcedt005.html">
+<topic label="Content assist" href="topics/csrcedt006.html"/>
+<topic label="Making content assist work for JSP files" href="topics/tsrcedt023.html"/>
+</topic>
+<topic label="Associating editors with file types" href="topics/tcontenttype.html"/>
+<topic label="File Encoding" href="topics/cencoding.html"/>
+<topic label="Searching or finding text within a file" href="topics/tsrcedt007.html"/>
+<topic label="Checking spelling" href="topics/tsrcedt010.html"/>
+<topic label="Adding and removing markup language templates - overview" href="topics/tsrcedt027.html">
+<topic label="Adding and removing HTML templates" href="topics/tsrcedt024.html"/>
+<topic label="Adding and removing JSP templates" href="topics/tsrcedt028.html"/>
+<topic label="Adding and removing XML templates" href="topics/tsrcedt029.html"/>
+</topic>
+<topic label="Editing with snippets - overview" href="topics/tsrcedt026.html">
+<topic label="Snippets view" href="topics/csrcedt001.html"/>
+<topic label="Adding snippets drawers" href="topics/tsrcedt014.html"/>
+<topic label="Adding items to snippets drawers" href="topics/tsrcedt015.html"/>
+<topic label="Editing snippet items" href="topics/tsrcedt022.html"/>
+<topic label="Deleting or hiding snippet items or drawers" href="topics/tsrcedt016.html"/>
+</topic>
+</topic>
+</topic>
 </toc>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
index a63fabd..1b63f4d 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
@@ -1,40 +1,56 @@
-<?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">
+<?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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<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 content="concept" name="DC.Type" />
+<meta name="DC.Title" content="File Encoding" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="character encoding, location in files, JSP files, XHTML, XML" name="DC.subject" />
+<meta content="character encoding, location in files, JSP files, XHTML, XML" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cencoding" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
 <title>File Encoding</title>
 </head>
 <body id="cencoding"><a name="cencoding"><!-- --></a>
+
+
 <h1 class="topictitle1">File Encoding</h1>
-<div><p></p>
+
+
+
+<div><p />
+
 <p> The character encoding in XML, (X)HTML files, and JSP files can be specified
 and invoked in many different ways; however, we recommend that you specify
 the encoding in each one of your source files, for that is where many XML,
 HTML, JSP editors expect to find the encoding.</p>
+
 <div class="p">For example, for JSP files, you might use the pageEncoding attribute and/or
 the contentType attribute in the page directive, as shown in the following
 example:<pre>&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;</pre>
+    pageEncoding="ISO-8859-1"%&gt;
+</pre>
 </div>
+
 <div class="p">For XML files, you might use the encoding pseudo-attribute in the xml declaration
 at the start of a document or the text declaration at the start of an entity,
 as in the following example: <pre>&lt;?xml version="1.0" encoding="iso-8859-1" ?&gt;</pre>
 </div>
+
 <div class="p">For (X)HTML files, you might use the &lt;meta&gt; tag inside the &lt;head&gt;
 tags, as shown in the following example:<pre>&lt;meta http-equiv="Content-Type" content="text/html;charset=utf-8" /&gt;</pre>
 </div>
+
 </div>
+
+
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
index a37e9de..0d53f9d 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
index ec3d55e..eec0867 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -35,6 +35,7 @@
 
 <p>
 
+
 The structured text editor is represented by various editors that you can
 use to edit files coded with markup tags:</p>
 
@@ -42,11 +43,11 @@
 <div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
 <thead align="left">
 <tr>
-<th valign="top" width="30.47945205479452%" id="N1008A">File type</th>
+<th valign="top" width="30.47945205479452%" id="N10086">File type</th>
 
-<th valign="top" width="45.89041095890411%" id="N10092">Editor</th>
+<th valign="top" width="45.89041095890411%" id="N1008E">Editor</th>
 
-<th valign="top" width="23.63013698630137%" id="N1009A">Content assist?</th>
+<th valign="top" width="23.63013698630137%" id="N10096">Content assist?</th>
 
 </tr>
 
@@ -54,66 +55,66 @@
 
 <tbody>
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">Cascading style sheet</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">Cascading style sheet</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">CSS source page editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">CSS source page editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">Document type definitions</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">Document type definitions</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">DTD source page editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">DTD source page editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">No</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">No</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">HTML</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">HTML</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">HTML source page editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">HTML source page editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">JavaScript™</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">JavaScript™</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">JavaScript source page editor or source
+<td valign="top" width="45.89041095890411%" headers="N1008E ">JavaScript source page editor or source
 tab of JavaScript editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">JSP</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">JSP</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">JSP source page editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">JSP source page editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">XML</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">XML</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">Source tab of XML editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">Source tab of XML editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30.47945205479452%" headers="N1008A ">XSD (schema)</td>
+<td valign="top" width="30.47945205479452%" headers="N10086 ">XSD (schema)</td>
 
-<td valign="top" width="45.89041095890411%" headers="N10092 ">Source tab of XML schema editor</td>
+<td valign="top" width="45.89041095890411%" headers="N1008E ">Source tab of XML schema editor</td>
 
-<td valign="top" width="23.63013698630137%" headers="N1009A ">Yes</td>
+<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
 
 </tr>
 
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 79203a5..2dbfe9d 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
@@ -9,8 +9,9 @@
 in the source file provides the context for the content assist to offer suggestions

 for completion.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>content assistance<indexterm>overview</indexterm></indexterm>

-<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>

+<keywords><indexterm keyref="csrcedt006|1|contentassistanceoverview" status="new">content

+assistance<indexterm>overview</indexterm></indexterm><indexterm keyref="csrcedt006|2|structuredtexteditorscontentassistance"

+status="changed">structured text editors<indexterm>content assistance<indexterm>overview</indexterm></indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <conbody>

@@ -65,16 +66,16 @@
 tmtype="tm" trademark="Java">Java</tm> VM to terminate. Instead of double-clicking

 on the list, use the arrows and Enter keys to make the selection from the

 list.</note></section>

-<section><?Pub Caret1?><title>JSP content assist</title><p>You have many options

-for embedding <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> and HTML code in your JSP pages by using content

-assist.</p><p>All of the JSP tags are included both in the template list and

-in XML format (for example, <codeph>&lt;jsp:expression></codeph>). To add

-JSP scriptlet tags, for example, move the cursor to the appropriate position

-in the file and press Ctrl+Space to use content assist. Select <image alt="JSP scriptlet content assist"

-href="../images/nmacscrp.gif" placement="inline"></image> from the proposal

-list to insert <codeph>&lt;% %></codeph>  in the document.</p><p>Scriptlets

-are inserted in a tag <codeph>&lt;% %></codeph>. For example: <codeblock>&lt;% System.currentTimeMillis() %></codeblock></p><p>This

+<section><title>JSP content assist</title><p>You have many options for embedding <tm

+tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> and

+HTML code in your JSP pages by using content assist.</p><p>All of the JSP

+tags are included both in the template list and in XML format (for example, <codeph>&lt;jsp:expression></codeph>).

+To add JSP scriptlet tags, for example, move the cursor to the appropriate

+position in the file and press Ctrl+Space to use content assist. Select <image

+alt="JSP scriptlet content assist" href="../images/nmacscrp.gif" placement="inline">

+</image> from the proposal list to insert <codeph>&lt;% %></codeph>  in the

+document.</p><p>Scriptlets are inserted in a tag <codeph>&lt;% %></codeph>.

+For example: <codeblock>&lt;% System.currentTimeMillis() %></codeblock></p><p>This

 example will evaluate the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

 tmtype="tm" trademark="Java">Java</tm> statement to get the current time in

 milliseconds.</p><p>To have the result of the statement inserted in the file,

@@ -112,4 +113,3 @@
 </linkpool>

 </related-links>

 </concept>

-<?Pub *0000008076?>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
index 1fc5f54..a704679 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2007" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Content assist" />
 <meta name="abstract" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
 <meta name="description" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
-<meta content="content assist, overview, structured text editors" name="DC.subject" />
-<meta content="content assist, overview, structured text editors" name="keywords" />
+<meta content="content assistance, overview, structured text editors, content assistance" name="DC.subject" />
+<meta content="content assistance, overview, structured text editors, content assistance" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
index 92ed51e..c430e77 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
@@ -6,8 +6,8 @@
 <title>Source and batch validation</title>

 <shortdesc></shortdesc>

 <prolog><metadata>

-<keywords><indexterm>validation<indexterm>source vs batch</indexterm></indexterm>

-</keywords>

+<keywords><indexterm keyref="cvalidate|1|validationsourcevsbatch" status="changed">validation<indexterm>source

+versus batch</indexterm></indexterm></keywords>

 </metadata></prolog>

 <conbody>

 <p>There are two types of validation that can occur when you are working with

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
index 3f2388f..7796212 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
@@ -1,26 +1,37 @@
-<?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">
+<?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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<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 content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Source and batch validation" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="validation, source versus batch" name="DC.subject" />
+<meta content="validation, source versus batch" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="csrcedt001" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
 <title>Source and batch validation</title>
 </head>
 <body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
+
+
 <h1 class="topictitle1">Source and batch validation</h1>
-<div><p></p>
+
+
+
+<div><p />
+
 <p>There are two types of validation that can occur when you are working with
 source files in a structured source editor: source validation and batch validation. </p>
+
 <div class="p">Source validation occurs as you type your code; this validation reflects
 the "unsaved" and "unbuilt" contents of the source you are editing. For example,
 if you were to type the following code in a JSP editor:<p><samp class="codeph">&lt;foo:bar&gt;</samp></p>
@@ -28,27 +39,39 @@
 a tag that does not exist, the problem would be discovered immediately and
 would appear underlined in the editor. The advantage of this type of validation
 is that it can alert you to errors instantly.<div class="note"><span class="notetitle">Note:</span> To turn source validation
-on (or off) for all structured text editors, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editors</span></span> and check (or
+on (or off) for all structured text editors, click <span class="menucascade"><span class="uicontrol">Window</span>
+ &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span>
+ &gt; <span class="uicontrol">Structured Text Editors</span></span> and check (or
 uncheck) <strong>Report problems as you type</strong>.</div>
 </div>
+
 <div class="p">Batch validation occurs on saved files. It can catch build process errors
 and other errors that the source validator cannot. For example, suppose you
-typed the following in a JSP editor:<p><samp class="codeph">&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;<br />
+typed the following in a JSP editor:<p><br />
+<samp class="codeph">&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;<br />
 &lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;</samp></p>
 In
 this example, the same prefix is used twice. This would prompt the batch validator
 to trigger markers and to generate build warnings in the Problems view and
 in the Navigator. </div>
+
 <p>Batch validation can uncover errors in multiple files at once and give
 you a comprehensive view of where problematic code can be found in your project.
 Moreover, you do not need to open files in an editor to run batch validation.
 To run batch validation on specific files, select and right click the files
-in the Project Explorer and then select <span class="menucascade"><span class="uicontrol">Validate</span></span> from the popup menu.</p>
-<div class="note"><span class="notetitle">Note:</span> To set preferences for batch validation, click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Validation</span></span></div>
+in the Project Explorer and then select <span class="menucascade"><span class="uicontrol">Validate</span>
+</span> from the popup menu.</p>
+
+<div class="note"><span class="notetitle">Note:</span> To set preferences for batch validation, click <span class="menucascade"><span class="uicontrol">Window</span>
+ &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Validation</span></span></div>
+
 </div>
+
 <div><div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
 languages</a></div>
 </div>
-</div></body>
+</div>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
index ae9df23..b5f1861 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
@@ -1,26 +1,36 @@
-<?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">
+<?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>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<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 content="task" name="DC.Type" />
+<meta name="DC.Title" content="Associating editors with additional files types" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="content types, mapping file extensions, file extensions, mapping content types, file types, editors" name="DC.subject" />
+<meta content="content types, mapping file extensions, file extensions, mapping content types, file types, editors" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tcontenttype" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
 <title>Associating editors with additional files types</title>
 </head>
 <body id="tcontenttype"><a name="tcontenttype"><!-- --></a>
+
+
 <h1 class="topictitle1">Associating editors with additional files types</h1>
-<div><p></p>
+
+
+
+<div><p />
+
 <div class="section"><p>You can associate certain editors with a file type by clicking
-on <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">File
+on <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
+ &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">File
 Association</span></span> and setting up the associations in the
 File Associations Window.</p>
 <p>Some Eclipse-based editors, however, will
@@ -28,13 +38,21 @@
 you want to associate an additional file type with some editors, you may have
 to first map the content type with its file extension. To map a content type
 with a file extension, complete the following steps: </p>
-<ol><li>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Content Types</span></span>. The Content Type window
+<ol>
+<li>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">General</span>
+ &gt; <span class="uicontrol">Content Types</span></span>. The Content Type window
 appears. </li>
+
 <li>Select a content type in the Content Type window, and then select <strong>Add</strong> .
 The Define a New File Type window appears.</li>
+
 <li>Type the name of the file type, and then click <strong>OK</strong>.</li>
+
 </ol>
 </div>
+
 </div>
+
+
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
index e38d4f1..5094861 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Editing text coded in markup languages - overview" />
 <meta name="abstract" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
 <meta name="description" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
-<meta content="markup languages, editing, structured text editors, markup language editing, overview" name="DC.subject" />
-<meta content="markup languages, editing, structured text editors, markup language editing, overview" name="keywords" />
+<meta content="markup languages, editing text, text, editing in markup languages" name="DC.subject" />
+<meta content="markup languages, editing text, text, editing in markup languages" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
index 471b837..d100c8c 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

 <task id="tsrcedt001" xml:lang="en-us">

@@ -13,9 +13,10 @@
 to highlight errors, warnings, tasks, search results, bookmarks, and other

 text.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>annotation preferences<indexterm>markup language settings</indexterm></indexterm><indexterm>markup languages<indexterm>setting annotation preferences</indexterm></indexterm>

-

-

+<keywords><indexterm keyref="tsrcedt001|1|annotationpreferencesmarkuplanguagesettings"

+status="changed">annotations<indexterm>markup language settings</indexterm></indexterm>

+<indexterm keyref="tsrcedt001|2|markuplanguagessettingannotationpreferences"

+status="new">markup languages<indexterm>setting annotation preferences</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
index b069e85..1fca557 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Setting annotation preferences for markup languages" />
 <meta name="abstract" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
 <meta name="description" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
-<meta content="annotation preferences, markup language settings, markup languages, setting annotation preferences" name="DC.subject" />
-<meta content="annotation preferences, markup language settings, markup languages, setting annotation preferences" name="keywords" />
+<meta content="annotations, markup language settings, markup languages, setting annotation preferences" name="DC.subject" />
+<meta content="annotations, markup language settings, markup languages, setting annotation preferences" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt025.html" />
 <meta content="XHTML" name="DC.Format" />
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 958f2ee..5083676 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

 <task id="tsrcedt005" xml:lang="en-us">

@@ -12,8 +12,10 @@
 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 assistance<indexterm>structured text editors</indexterm></indexterm>

-<indexterm>structured text editors<indexterm>content assistance</indexterm></indexterm>

+<keywords><indexterm keyref="tsrcedt005|1|contentassistancestructuredtexteditors"

+status="new">content assistance<indexterm>structured text editors</indexterm></indexterm>

+<indexterm keyref="tsrcedt005|2|structuredtexteditorscontentassistance" status="changed">structured

+text editors<indexterm>content assistance<indexterm>text editors</indexterm></indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
index 39640bd..fb68fc1 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Getting content assistance in structured text editors" />
 <meta name="abstract" content="To get help in adding markup to a file, you can use content assist 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." />
 <meta name="description" content="To get help in adding markup to a file, you can use content assist 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." />
-<meta content="content assist, structured text editors" name="DC.subject" />
-<meta content="content assist, structured text editors" name="keywords" />
+<meta content="content assistance, structured text editors, structured text editors, text editors" name="DC.subject" />
+<meta content="content assistance, structured text editors, structured text editors, text editors" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt023.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
index 3c6a789..2f788ed 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
index 0df2732..adc62d3 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
index 22bbb84..45145e0 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding snippets drawers" />
 <meta name="abstract" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
 <meta name="description" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
-<meta content="snippets, drawers, adding, deleting, editing items, hiding" name="DC.subject" />
-<meta content="snippets, drawers, adding, deleting, editing items, hiding" name="keywords" />
+<meta content="snippets, drawer customization" name="DC.subject" />
+<meta content="snippets, drawer customization" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
@@ -51,21 +51,21 @@
 The check boxes are as follows:</span>
 
 <table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100A4-option" align="left">Option</th>
-<th valign="bottom" id="N100A4-desc" align="left">Description</th></tr></thead>
+<thead><tr><th valign="bottom" id="N10090-option" align="left">Option</th>
+<th valign="bottom" id="N10090-desc" align="left">Description</th></tr></thead>
 <tbody>
-<tr><td valign="top" headers="N100A4-option" id="N100AE"><strong>Hide</strong></td>
-<td valign="top" headers="N100A4-desc N100AE">Do not display the drawer.</td>
+<tr><td valign="top" headers="N10090-option" id="N1009A"><strong>Hide</strong></td>
+<td valign="top" headers="N10090-desc N1009A">Do not display the drawer.</td>
 
 </tr>
 
-<tr><td valign="top" headers="N100A4-option" id="N100BE"><strong>Open drawer at start-up</strong></td>
-<td valign="top" headers="N100A4-desc N100BE">At start-up, display
+<tr><td valign="top" headers="N10090-option" id="N100AA"><strong>Open drawer at start-up</strong></td>
+<td valign="top" headers="N10090-desc N100AA">At start-up, display
 the drawer's items.</td>
 </tr>
 
-<tr><td valign="top" headers="N100A4-option" id="N100CD"><strong>Pin drawer open at start-up</strong></td>
-<td valign="top" headers="N100A4-desc N100CD">Keep the drawer
+<tr><td valign="top" headers="N10090-option" id="N100B9"><strong>Pin drawer open at start-up</strong></td>
+<td valign="top" headers="N10090-desc N100B9">Keep the drawer
 open.</td>
 </tr>
 
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 e1195f9..72bcceb 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

 <task id="tsrcedt015" xml:lang="en-us">

 <title>Adding items to snippets drawers</title>

 <prolog><metadata>

-<keywords><indexterm>snippet drawers<indexterm>adding items</indexterm></indexterm>

-<indexterm>snippet items<indexterm>adding to drawers</indexterm></indexterm>

+<keywords><indexterm keyref="tsrcedt015|2|snippetitemsaddingtodrawers" status="changed">snippets<indexterm>drawers</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody>

-<context> To add new items to an existing snippets drawer::</context>

+<context> To add new items to an existing snippets drawer:</context>

 <steps>

 <step><cmd>Do one of the following choices:</cmd><info><table colsep="0" frame="topbot">

 <tgroup cols="2"><colspec colname="col1" colwidth="72*"/><colspec colname="col2"

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
index 2c928aa..db15ee8 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
@@ -2,15 +2,15 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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 content="task" name="DC.Type" />
 <meta name="DC.Title" content="Adding items to snippets drawers" />
-<meta content="snippet drawers, adding items to, snippet items, adding to drawers" name="DC.subject" />
-<meta content="snippet drawers, adding items to, snippet items, adding to drawers" name="keywords" />
+<meta content="snippets, drawers" name="DC.subject" />
+<meta content="snippets, drawers" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
@@ -29,16 +29,16 @@
 
 
 <div>
-<div class="section"> To add new items to an existing snippets drawer::</div>
+<div class="section"> To add new items to an existing snippets drawer:</div>
 
 <ol>
 <li class="stepexpand"><span>Do one of the following choices:</span> 
 <div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="hsides" border="1" rules="rows">
 <thead align="left">
 <tr>
-<th valign="top" width="36.18090452261307%" id="N10079">To start with this:</th>
+<th valign="top" width="36.18090452261307%" id="N10070">To start with this:</th>
 
-<th valign="top" width="63.81909547738693%" id="N10081">Do this:</th>
+<th valign="top" width="63.81909547738693%" id="N10078">Do this:</th>
 
 </tr>
 
@@ -46,28 +46,28 @@
 
 <tbody>
 <tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">An empty item that you can edit</td>
+<td valign="top" width="36.18090452261307%" headers="N10070 ">An empty item that you can edit</td>
 
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Right-click anywhere in an existing drawer, select <span class="uicontrol">Customize</span>,
+<td valign="top" width="63.81909547738693%" headers="N10078 ">Right-click anywhere in an existing drawer, select <span class="uicontrol">Customize</span>,
 and click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">New Item</span>
 </span>.</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">Existing text pasted into a new item in an existing
+<td valign="top" width="36.18090452261307%" headers="N10070 ">Existing text pasted into a new item in an existing
 drawer</td>
 
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Copy or cut text to the clipboard. In the Snippets view,
+<td valign="top" width="63.81909547738693%" headers="N10078 ">Copy or cut text to the clipboard. In the Snippets view,
 right-click anywhere in an existing drawer and click <span class="uicontrol">Paste</span>.</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="36.18090452261307%" headers="N10079 ">Existing text pasted into a new item in a new or existing
+<td valign="top" width="36.18090452261307%" headers="N10070 ">Existing text pasted into a new item in a new or existing
 drawer</td>
 
-<td valign="top" width="63.81909547738693%" headers="N10081 ">Select the text, right-click, click <span class="uicontrol">Add to
+<td valign="top" width="63.81909547738693%" headers="N10078 ">Select the text, right-click, click <span class="uicontrol">Add to
 Snippets</span>, specify the name of the drawer in the Snippets view
 to which you want to add the item, and click <span class="uicontrol">OK</span>.</td>
 
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
index f3d7504..f10d376 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Deleting or hiding snippet items or drawers" />
 <meta name="abstract" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
 <meta name="description" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
-<meta content="snippets, deleting or hiding drawers, drawers, deleting snippets, hiding snippets" name="DC.subject" />
-<meta content="snippets, deleting or hiding drawers, drawers, deleting snippets, hiding snippets" name="keywords" />
+<meta content="drawers, snippets view, snippets, modifying drawers" name="DC.subject" />
+<meta content="drawers, snippets view, snippets, modifying drawers" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
index d1a8987..bd58a0e 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
index e50a155..7d0a869 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Enabling content assist for JSP files" />
 <meta name="abstract" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
 <meta name="description" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
-<meta content="JSP files, content assist enablement, content assist, enabling for JSP files" name="DC.subject" />
-<meta content="JSP files, content assist enablement, content assist, enabling for JSP files" name="keywords" />
+<meta content="content assistance, enabling for JSP files, JSP files, enabling content assistance" name="DC.subject" />
+<meta content="content assistance, enabling for JSP files, JSP files, enabling content assistance" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
index f627370..a16a406 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
index e390542..e634015 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

 <task id="tsrcedt025" xml:lang="en-us">

@@ -8,8 +8,8 @@
 <navtitle>Setting structured text editor preferences</navtitle>

 </titlealts>

 <prolog><metadata>

-<keywords><indexterm>structured text editors<indexterm>preference setting</indexterm></indexterm>

-

+<keywords><indexterm keyref="tsrcedt025|1|structuredtexteditorspreferencesetting"

+status="changed">structured text editors<indexterm>preferences</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
index 2194f1e..6763db3 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
@@ -2,15 +2,15 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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 content="task" name="DC.Type" />
 <meta name="DC.Title" content="Setting preferences for structured text editors" />
-<meta content="structured text editors, preference setting" name="DC.subject" />
-<meta content="structured text editors, preference setting" name="keywords" />
+<meta content="structured text editors, preferences" name="DC.subject" />
+<meta content="structured text editors, preferences" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt001.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt010.html" />
@@ -39,85 +39,85 @@
 <li class="stepexpand"><span>Select one of the choices that are shown in the following table:</span>
 
 <table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1006E-option">Item</th>
-<th valign="bottom" id="N1006E-desc">Menu path</th></tr></thead>
+<thead><tr><th valign="bottom" id="N10070-option">Item</th>
+<th valign="bottom" id="N10070-desc">Menu path</th></tr></thead>
 <tbody>
 
-<tr><td valign="top" headers="N1006E-option" id="N10088"><strong>Annotation settings</strong></td>
-<td valign="top" headers="N1006E-desc N10088"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N1008A"><strong>Annotation settings</strong></td>
+<td valign="top" headers="N10070-desc N1008A"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Annotations</span></span></td>
 
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N100AB"><strong>Character encoding</strong></td>
-<td valign="top" headers="N1006E-desc N100AB"><span class="uicontrol">Web and XML</span>,
+<tr><td valign="top" headers="N10070-option" id="N100AD"><strong>Character encoding</strong></td>
+<td valign="top" headers="N10070-desc N100AD"><span class="uicontrol">Web and XML</span>,
 then one of the following choices: <span class="uicontrol">CSS Files</span>, <span class="uicontrol">HTML
 Files</span>, <span class="uicontrol">JSP Files</span>, <span class="uicontrol">*XML Files
 ( *not implemented in WTP)</span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N100D6"><strong>Content assist: HTML</strong></td>
-<td valign="top" headers="N1006E-desc N100D6"><span class="menucascade"><span class="uicontrol">Web
+<tr><td valign="top" headers="N10070-option" id="N100D8"><strong>Content assist: HTML</strong></td>
+<td valign="top" headers="N10070-desc N100D8"><span class="menucascade"><span class="uicontrol">Web
 and XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span>
 </span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N100F8"><strong>Content assist: JavaScript</strong></td>
-<td valign="top" headers="N1006E-desc N100F8"><span class="menucascade">
+<tr><td valign="top" headers="N10070-option" id="N100FA"><strong>Content assist: JavaScript</strong></td>
+<td valign="top" headers="N10070-desc N100FA"><span class="menucascade">
 <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">JavaScript Files</span>
  &gt; <span class="uicontrol">JavaScript Source</span></span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N1011B"><strong>Content assist: XML</strong></td>
-<td valign="top" headers="N1006E-desc N1011B"><span class="menucascade"><span class="uicontrol">Web
+<tr><td valign="top" headers="N10070-option" id="N1011D"><strong>Content assist: XML</strong></td>
+<td valign="top" headers="N10070-desc N1011D"><span class="menucascade"><span class="uicontrol">Web
 and XML</span> &gt; <span class="uicontrol">*XML Files (*not implemented in WTP)</span>
  &gt; <span class="uicontrol">XML Source</span></span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N1013D"><strong>Editor appearance</strong></td>
-<td valign="top" headers="N1006E-desc N1013D"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N1013F"><strong>Editor appearance</strong></td>
+<td valign="top" headers="N10070-desc N1013F"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
  &gt; <span class="uicontrol">Appearance</span></span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N10165"><strong>Editor font</strong></td>
-<td valign="top" headers="N1006E-desc N10165"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N10167"><strong>Editor font</strong></td>
+<td valign="top" headers="N10070-desc N10167"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Colors and Fonts</span> &gt; <span class="uicontrol">Structured Text Editor</span>
 </span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N10188"><strong>Editor navigation</strong></td>
-<td valign="top" headers="N1006E-desc N10188"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N1018A"><strong>Editor navigation</strong></td>
+<td valign="top" headers="N10070-desc N1018A"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
  &gt; <span class="uicontrol">Navigation</span></span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N101B0"><strong>File-type-specific settings</strong></td>
-<td valign="top" headers="N1006E-desc N101B0"><span class="uicontrol">Web
+<tr><td valign="top" headers="N10070-option" id="N101B2"><strong>File-type-specific settings</strong></td>
+<td valign="top" headers="N10070-desc N101B2"><span class="uicontrol">Web
 and XML</span>, then navigate to the file type and particular setting</td>
 
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N101C5"><strong>Hover help</strong></td>
-<td valign="top" headers="N1006E-desc N101C5"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N101C7"><strong>Hover help</strong></td>
+<td valign="top" headers="N10070-desc N101C7"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
  &gt; <span class="uicontrol">Hovers</span></span></td>
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N101ED"><strong>Key bindings</strong></td>
-<td valign="top" headers="N1006E-desc N101ED"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N101EF"><strong>Key bindings</strong></td>
+<td valign="top" headers="N10070-desc N101EF"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Keys</span> &gt; <span class="uicontrol">Keyboard Shortcuts</span></span> then
 in the <span class="uicontrol">Category</span> field specify <span class="uicontrol">Source</span></td>
 
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N1021C"><strong>Spell checking</strong></td>
-<td valign="top" headers="N1006E-desc N1021C"><span class="uicontrol">Spell Check</span></td>
+<tr><td valign="top" headers="N10070-option" id="N1021E"><strong>Spell checking</strong></td>
+<td valign="top" headers="N10070-desc N1021E"><span class="uicontrol">Spell Check</span></td>
 
 </tr>
 
-<tr><td valign="top" headers="N1006E-option" id="N10230"><strong>Syntax checking</strong></td>
-<td valign="top" headers="N1006E-desc N10230"><span class="menucascade"><span class="uicontrol">Workbench</span>
+<tr><td valign="top" headers="N10070-option" id="N10232"><strong>Syntax checking</strong></td>
+<td valign="top" headers="N10070-desc N10232"><span class="menucascade"><span class="uicontrol">Workbench</span>
  &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
  &gt; <span class="uicontrol">Appearance</span></span> then check or uncheck the <span class="uicontrol">Analyze
 annotations while typing</span> box.</td>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
index 85e03ed..2181e1a 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Editing with snippets - overview" />
 <meta name="abstract" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
 <meta name="description" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
-<meta content="snippets, overview, HTML, editing, reuse with snippets, JavaScript, JSP code, JSP tags, custom" name="DC.subject" />
-<meta content="snippets, overview, HTML, editing, reuse with snippets, JavaScript, JSP code, JSP tags, custom" name="keywords" />
+<meta content="snippets, overview" name="DC.subject" />
+<meta content="snippets, overview" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
index 66434c3..801e45f 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding and removing markup language templates - overview" />
 <meta name="abstract" content="Content assist provides templates, or chunks of predefined 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." />
 <meta name="description" content="Content assist provides templates, or chunks of predefined 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." />
-<meta content="markup languages, adding and removing templates" name="DC.subject" />
-<meta content="markup languages, adding and removing templates" name="keywords" />
+<meta content="markup languages, templates" name="DC.subject" />
+<meta content="markup languages, templates" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
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 cb9bc26..bcf81da 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

 <task id="tsrcedt028" xml:lang="en-us">

@@ -8,10 +8,9 @@
 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 pages<indexterm>templates</indexterm></indexterm>

-<indexterm>templates<indexterm>JSP pages</indexterm></indexterm>

-

-</keywords>

+<keywords><indexterm keyref="tsrcedt028|1|JSPpagestemplates" status="changed">JSP

+files<indexterm>templates</indexterm></indexterm><indexterm keyref="tsrcedt028|2|templatesJSPpages"

+status="new">templates<indexterm>JSP pages</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context> <p>For example, you may work on a group of JSP pages that should

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
index 57cf2d4..09647fb 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding and removing JSP templates" />
 <meta name="abstract" content="JSP content assist provides several templates, or chunks of predefined 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." />
 <meta name="description" content="JSP content assist provides several templates, or chunks of predefined 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." />
-<meta content="JSP templates, adding, removing, templates, JSP" name="DC.subject" />
-<meta content="JSP templates, adding, removing, templates, JSP" name="keywords" />
+<meta content="JSP files, templates, JSP pages" name="DC.subject" />
+<meta content="JSP files, templates, JSP pages" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
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 e41bd7c..30ebb08 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
@@ -2,18 +2,15 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "..\dtd\task.dtd">

-<!-- $Id: tsrcedt029.dita,v 1.4 2006/04/13 20:37:13 bkorn Exp $ -->

 <task id="tsrcedt027" xml:lang="en-us">

 <title>Adding and removing XML templates</title>

 <shortdesc>XML content assist provides a comment template, a chunk of predefined

 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>templates<indexterm>XML</indexterm></indexterm>

-<indexterm>xml templates<indexterm>adding</indexterm></indexterm>

-

-

-</keywords>

+<keywords><indexterm keyref="tsrcedt029|1|templatesXML" status="new">templates<indexterm>XML</indexterm></indexterm>

+<indexterm keyref="tsrcedt029|2|xmltemplatesadding" status="changed">XML<indexterm>adding

+templates</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context> <p>For example, you may work on a group of XML pages that should

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
index 07d2669..f674243 100644
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
+++ b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <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))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding and removing XML templates" />
 <meta name="abstract" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
 <meta name="description" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
-<meta content="xml templates, adding, removing, templates, XML" name="DC.subject" />
-<meta content="xml templates, adding, removing, templates, XML" name="keywords" />
+<meta content="templates, XML, adding templates" name="DC.subject" />
+<meta content="templates, XML, adding templates" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
 <meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs b/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs
deleted file mode 100644
index 795be84..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/_u.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/_v.cfs b/docs/org.eclipse.wst.xmleditor.doc.user/index/_v.cfs
new file mode 100644
index 0000000..676049f
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/_v.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable b/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
index 66ea04d..fa8ca7a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

-org.eclipse.wst.xmleditor.doc.user=org.eclipse.wst.xmleditor.doc.user\n1.0.300.qualifier

+#Wed May 14 19:09:45 EDT 2008

+org.eclipse.wst.xmleditor.doc.user=org.eclipse.wst.xmleditor.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
index 5d57cad..1b8cb0a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

+#Wed May 14 19:09:45 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
index 56fe33a..80c89a6 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
@@ -1,10 +1,11 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:15 EDT 2007

+#Wed May 14 19:09:45 EDT 2008

 /org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html=0

+/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html=0

 /org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html=0

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments b/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
index 19b5d0c..b198fa0 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
index f0c28f1..da5fafa 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
@@ -28,5 +28,7 @@
         point="org.eclipse.help.index">
         <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
   </extension>
-  
+  <extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist
new file mode 100644
index 0000000..6c3e248
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist
@@ -0,0 +1,8 @@
+<maplist version="3.6.2">

+  <nav>

+    <map file="XMLBuildermap_toc.ditamap"/>

+  </nav>

+  <link>

+    <map file="XMLBuilderrel.ditamap"/>

+  </link>

+</maplist>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
index 4b66584..2218ba0 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
@@ -10,6 +10,9 @@
     <entry keyword="generating from XML schemas">
       <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
     </entry>
+    <entry keyword="schemas">
+      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
+    </entry>
     <entry keyword="editing">
       <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
     </entry>
@@ -25,6 +28,9 @@
     <entry keyword="content assist">
       <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
     </entry>
+    <entry keyword="templates">
+      <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
+    </entry>
     <entry keyword="editing with constraints">
       <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
     </entry>
@@ -38,12 +44,12 @@
       <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
     </entry>
   </entry>
-  <entry keyword="DTD">
+  <entry keyword="DTDs">
     <entry keyword="generating XML files">
       <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
     </entry>
   </entry>
-  <entry keyword="XML schemas">
+  <entry keyword="schemas">
     <entry keyword="generating XML files">
       <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
     </entry>
@@ -88,6 +94,12 @@
     <entry keyword="updating XML files">
       <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
     </entry>
+    <entry keyword="accessibility">
+      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
+    </entry>
+    <entry keyword="keyboard shortcuts">
+      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
+    </entry>
     <entry keyword="icons">
       <topic href="topics/rxmlbicons.html#ricons" title="Icons used in the XML editor"/>
     </entry>
@@ -103,11 +115,6 @@
     </entry>
   </entry>
   <entry keyword="character encoding">
-    <entry keyword="text in files">
-      <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
-    </entry>
-  </entry>
-  <entry keyword="encodings">
     <entry keyword="supported character sets">
       <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
     </entry>
@@ -117,8 +124,8 @@
       <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
     </entry>
   </entry>
-  <entry keyword="XML templates">
-    <entry keyword="working with predefined code">
+  <entry keyword="templates">
+    <entry keyword="working with predefined XML code">
       <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
     </entry>
   </entry>
@@ -130,4 +137,23 @@
       <topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
     </entry>
   </entry>
+  <entry keyword="accessibility">
+    <entry keyword="keyboard shortcuts">
+      <entry keyword="XML editor">
+        <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
+      </entry>
+    </entry>
+  </entry>
+  <entry keyword="keyboard shortcuts">
+    <entry keyword="XML editor">
+      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
+    </entry>
+  </entry>
+  <entry keyword="shortcuts">
+    <entry keyword="keyboard">
+      <entry keyword="XML editor">
+        <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
+      </entry>
+    </entry>
+  </entry>
 </index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
index f0c28f1..da5fafa 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
@@ -28,5 +28,7 @@
         point="org.eclipse.help.index">
         <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
   </extension>
-  
+  <extension point="org.eclipse.help.base.luceneSearchParticipants">
+      <binding participantId="org.eclipse.help.base.xhtml"/>
+   </extension>
 </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
index a291679..b5f74d8 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
@@ -2,7 +2,6 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

-<?Pub Inc?>

 <concept id="cxmlenc" xml:lang="en-us">

 <title>XML and HTML encodings</title>

 <titlealts>

@@ -11,9 +10,8 @@
 <shortdesc>Encodings enable you to specify what character encoding your text

 is in.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>character encoding<indexterm>text in files</indexterm></indexterm>

-<indexterm>encodings<indexterm>supported character sets</indexterm></indexterm>

-</keywords>

+<keywords><indexterm keyref="cxmlenc|1|characterencodingtextinfiles" status="changed">character

+encoding<indexterm>supported character sets</indexterm></indexterm></keywords>

 </metadata></prolog>

 <conbody>

 <p>The IANA name is used in the encoding statement of an XML file, or charset

@@ -118,7 +116,7 @@
 <entry> <p>Unicode LittleEndian</p> </entry>

 </row>

 <row>

-<entry colname="COLSPEC0"><p>WINDOWS-31J<?Pub Caret?></p></entry>

+<entry colname="COLSPEC0"><p>WINDOWS-31J</p></entry>

 <entry colname="COLSPEC1"><p>Japanese, Windows-31J</p></entry>

 </row>

 <row>

@@ -134,4 +132,3 @@
 </table>

 </conbody>

 </concept>

-<?Pub *0000003415?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
index f58ec34..5fa5774 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="XML and HTML encodings" />
 <meta name="abstract" content="Encodings enable you to specify what character encoding your text is in." />
 <meta name="description" content="Encodings enable you to specify what character encoding your text is in." />
-<meta content="character encoding, text in files, encodings, supported character sets" name="DC.subject" />
-<meta content="character encoding, text in files, encodings, supported character sets" name="keywords" />
+<meta content="character encoding, supported character sets" name="DC.subject" />
+<meta content="character encoding, supported character sets" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cxmlenc" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -39,10 +39,10 @@
 <div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
 <thead align="left">
 <tr>
-<th valign="top" class="firstcol" id="N1007C"> <p><strong>XML Encoding (IANA Name)</strong></p>
+<th valign="top" class="firstcol" id="N10072"> <p><strong>XML Encoding (IANA Name)</strong></p>
  </th>
 
-<th valign="top" id="N1008E"> <p><strong>Description</strong></p>
+<th valign="top" id="N10084"> <p><strong>Description</strong></p>
  </th>
 
 </tr>
@@ -51,211 +51,211 @@
 
 <tbody>
 <tr>
-<th valign="top" class="firstcol" id="N100AC" headers="N1007C "> <p>BIG5</p>
+<th valign="top" class="firstcol" id="N100A2" headers="N10072 "> <p>BIG5</p>
  </th>
 
-<td valign="top" headers="N100AC N1008E "> <p>Big5, Traditional Chinese</p>
+<td valign="top" headers="N100A2 N10084 "> <p>Big5, Traditional Chinese</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N100CC" headers="N1007C "> <p>EUC-JP</p>
+<th valign="top" class="firstcol" id="N100C2" headers="N10072 "> <p>EUC-JP</p>
  </th>
 
-<td valign="top" headers="N100CC N1008E "> <p>EUC encoding, Japanese</p>
+<td valign="top" headers="N100C2 N10084 "> <p>EUC encoding, Japanese</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N100EC" headers="N1007C "> <p>EUC-KR</p>
+<th valign="top" class="firstcol" id="N100E2" headers="N10072 "> <p>EUC-KR</p>
  </th>
 
-<td valign="top" headers="N100EC N1008E "> <p>EUC encoding, Korean</p>
+<td valign="top" headers="N100E2 N10084 "> <p>EUC encoding, Korean</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N1010C" headers="N1007C ">GB18030</th>
+<th valign="top" class="firstcol" id="N10102" headers="N10072 ">GB18030</th>
 
-<td valign="top" headers="N1010C N1008E ">National Standard, Chinese</td>
+<td valign="top" headers="N10102 N10084 ">National Standard, Chinese</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10120" headers="N1007C "> <p>ISO-2022-JP</p>
+<th valign="top" class="firstcol" id="N10116" headers="N10072 "> <p>ISO-2022-JP</p>
  </th>
 
-<td valign="top" headers="N10120 N1008E "> <p>ISO 2022, Japanese</p>
+<td valign="top" headers="N10116 N10084 "> <p>ISO 2022, Japanese</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10140" headers="N1007C "> <p>ISO-2022-KR</p>
+<th valign="top" class="firstcol" id="N10136" headers="N10072 "> <p>ISO-2022-KR</p>
  </th>
 
-<td valign="top" headers="N10140 N1008E "> <p>ISO 2022, Korean</p>
+<td valign="top" headers="N10136 N10084 "> <p>ISO 2022, Korean</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10160" headers="N1007C "> <p>ISO-8859-1</p>
+<th valign="top" class="firstcol" id="N10156" headers="N10072 "> <p>ISO-8859-1</p>
  </th>
 
-<td valign="top" headers="N10160 N1008E "> <p>ISO Latin-1</p>
+<td valign="top" headers="N10156 N10084 "> <p>ISO Latin-1</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10180" headers="N1007C ">ISO-8859-2</th>
+<th valign="top" class="firstcol" id="N10176" headers="N10072 ">ISO-8859-2</th>
 
-<td valign="top" headers="N10180 N1008E ">Central/East European (Slavic)</td>
+<td valign="top" headers="N10176 N10084 ">Central/East European (Slavic)</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10194" headers="N1007C ">ISO-8859-3</th>
+<th valign="top" class="firstcol" id="N1018A" headers="N10072 ">ISO-8859-3</th>
 
-<td valign="top" headers="N10194 N1008E ">Southern European</td>
+<td valign="top" headers="N1018A N10084 ">Southern European</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N101A8" headers="N1007C ">ISO-8859-4</th>
+<th valign="top" class="firstcol" id="N1019E" headers="N10072 ">ISO-8859-4</th>
 
-<td valign="top" headers="N101A8 N1008E ">ISO 8859-4, Cyrillic</td>
+<td valign="top" headers="N1019E N10084 ">ISO 8859-4, Cyrillic</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N101BC" headers="N1007C ">ISO-8859-5</th>
+<th valign="top" class="firstcol" id="N101B2" headers="N10072 ">ISO-8859-5</th>
 
-<td valign="top" headers="N101BC N1008E ">ISO 8859-5, Cyrillic</td>
+<td valign="top" headers="N101B2 N10084 ">ISO 8859-5, Cyrillic</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N101D0" headers="N1007C "> <p>ISO-8859-6</p>
+<th valign="top" class="firstcol" id="N101C6" headers="N10072 "> <p>ISO-8859-6</p>
  </th>
 
-<td valign="top" headers="N101D0 N1008E "> <p>Arabic (Logical)</p>
+<td valign="top" headers="N101C6 N10084 "> <p>Arabic (Logical)</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N101F0" headers="N1007C ">ISO-8859-7</th>
+<th valign="top" class="firstcol" id="N101E6" headers="N10072 ">ISO-8859-7</th>
 
-<td valign="top" headers="N101F0 N1008E ">Greek</td>
+<td valign="top" headers="N101E6 N10084 ">Greek</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10204" headers="N1007C "> <p>ISO-8859-8</p>
+<th valign="top" class="firstcol" id="N101FA" headers="N10072 "> <p>ISO-8859-8</p>
  </th>
 
-<td valign="top" headers="N10204 N1008E "> <p>Hebrew (Visual) (encoding supported, but not supported by the Page
+<td valign="top" headers="N101FA N10084 "> <p>Hebrew (Visual) (encoding supported, but not supported by the Page
 Designer Design page)</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10224" headers="N1007C ">ISO-8859-9</th>
+<th valign="top" class="firstcol" id="N1021A" headers="N10072 ">ISO-8859-9</th>
 
-<td valign="top" headers="N10224 N1008E ">Turkish</td>
+<td valign="top" headers="N1021A N10084 ">Turkish</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10238" headers="N1007C "> <p>SHIFT_JIS</p>
+<th valign="top" class="firstcol" id="N1022E" headers="N10072 "> <p>SHIFT_JIS</p>
  </th>
 
-<td valign="top" headers="N10238 N1008E "> <p>Shift-JIS, Japanese</p>
+<td valign="top" headers="N1022E N10084 "> <p>Shift-JIS, Japanese</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10258" headers="N1007C ">TIS-620</th>
+<th valign="top" class="firstcol" id="N1024E" headers="N10072 ">TIS-620</th>
 
-<td valign="top" headers="N10258 N1008E ">TISI, Thai</td>
+<td valign="top" headers="N1024E N10084 ">TISI, Thai</td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N1026C" headers="N1007C "> <p>US-ASCII</p>
+<th valign="top" class="firstcol" id="N10262" headers="N10072 "> <p>US-ASCII</p>
  </th>
 
-<td valign="top" headers="N1026C N1008E "> <p>US ASCII</p>
+<td valign="top" headers="N10262 N10084 "> <p>US ASCII</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N1028C" headers="N1007C "> <p>UTF-8</p>
+<th valign="top" class="firstcol" id="N10282" headers="N10072 "> <p>UTF-8</p>
  </th>
 
-<td valign="top" headers="N1028C N1008E "> <p>ISO 10646/Unicode, one-byte encoding</p>
+<td valign="top" headers="N10282 N10084 "> <p>ISO 10646/Unicode, one-byte encoding</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N102AC" headers="N1007C "> <p>UTF-16</p>
+<th valign="top" class="firstcol" id="N102A2" headers="N10072 "> <p>UTF-16</p>
  </th>
 
-<td valign="top" headers="N102AC N1008E "> <p>ISO 10646/Unicode, two-byte encoding</p>
+<td valign="top" headers="N102A2 N10084 "> <p>ISO 10646/Unicode, two-byte encoding</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N102CC" headers="N1007C "> <p>UTF-16BE</p>
+<th valign="top" class="firstcol" id="N102C2" headers="N10072 "> <p>UTF-16BE</p>
  </th>
 
-<td valign="top" headers="N102CC N1008E "> <p>Unicode BigEndian</p>
+<td valign="top" headers="N102C2 N10084 "> <p>Unicode BigEndian</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N102EC" headers="N1007C "> <p>UTF-16LE</p>
+<th valign="top" class="firstcol" id="N102E2" headers="N10072 "> <p>UTF-16LE</p>
  </th>
 
-<td valign="top" headers="N102EC N1008E "> <p>Unicode LittleEndian</p>
+<td valign="top" headers="N102E2 N10084 "> <p>Unicode LittleEndian</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N1030C" headers="N1007C "><p>WINDOWS-31J</p>
+<th valign="top" class="firstcol" id="N10302" headers="N10072 "><p>WINDOWS-31J</p>
 </th>
 
-<td valign="top" headers="N1030C N1008E "><p>Japanese, Windows-31J</p>
+<td valign="top" headers="N10302 N10084 "><p>Japanese, Windows-31J</p>
 </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10328" headers="N1007C "> <p>WINDOWS-1255</p>
+<th valign="top" class="firstcol" id="N1031E" headers="N10072 "> <p>WINDOWS-1255</p>
  </th>
 
-<td valign="top" headers="N10328 N1008E "> <p>Hebrew</p>
+<td valign="top" headers="N1031E N10084 "> <p>Hebrew</p>
  </td>
 
 </tr>
 
 <tr>
-<th valign="top" class="firstcol" id="N10348" headers="N1007C "> <p>WINDOWS-1256</p>
+<th valign="top" class="firstcol" id="N1033E" headers="N10072 "> <p>WINDOWS-1256</p>
  </th>
 
-<td valign="top" headers="N10348 N1008E "> <p>Arabic</p>
+<td valign="top" headers="N1033E N10084 "> <p>Arabic</p>
  </td>
 
 </tr>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
index 16864ce..e1efde5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
@@ -13,8 +13,10 @@
 your DTD, and contains at least some of the elements and attributes in your

 DTD.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>XML files<indexterm>generating from DTDs</indexterm></indexterm>

-<indexterm>DTD<indexterm>generating XML files</indexterm></indexterm></keywords>

+<keywords><indexterm keyref="tcrexdtd|1|XMLfilesgeneratingfromDTDs" status="new">XML

+files<indexterm>generating from DTDs</indexterm></indexterm><indexterm keyref="tcrexdtd|2|DTDgeneratingXMLfiles"

+status="changed">DTDs<indexterm>generating XML files</indexterm></indexterm>

+</keywords>

 </metadata></prolog>

 <taskbody>

 <context><p>After you have generated your XML file, you can further customize

@@ -41,8 +43,8 @@
 optional elements will be generated.</choice>

 <choice><uicontrol>Create first choice of required choice</uicontrol>: the

 first option of a required choice will be generated in your XML file.</choice>

-<choice><uicontrol>Fill elements and attributes with data</uicontrol>:<?Pub Caret?>

-any elements and attributes generated will be filled with sample data.</choice>

+<choice><uicontrol>Fill elements and attributes with data</uicontrol>: any

+elements and attributes generated will be filled with sample data.</choice>

 </choices>

 <info> If you do not select any of these options, then only the minimum amount

 of content required for the XML file will be created.</info></step>

@@ -57,4 +59,3 @@
 the rules established in the DTD that you used to create the XML file.</p></result>

 </taskbody>

 </task>

-<?Pub *0000003391?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
index 29d6b7b..3a44cf4 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Generating XML files from DTDs" />
 <meta name="abstract" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
 <meta name="description" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta content="XML files, generating from DTDs, DTD, generating XML files" name="DC.subject" />
-<meta content="XML files, generating from DTDs, DTD, generating XML files" name="keywords" />
+<meta content="XML files, generating from DTDs, DTDs, generating XML files" name="DC.subject" />
+<meta content="XML files, generating from DTDs, DTDs, generating XML files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
@@ -71,8 +71,8 @@
 <li><span class="uicontrol">Create first choice of required choice</span>: the
 first option of a required choice will be generated in your XML file.</li>
 
-<li><span class="uicontrol">Fill elements and attributes with data</span>:
-any elements and attributes generated will be filled with sample data.</li>
+<li><span class="uicontrol">Fill elements and attributes with data</span>: any
+elements and attributes generated will be filled with sample data.</li>
 
 </ul>
 
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
index afb257c..6ba3873 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
@@ -2,7 +2,6 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "task.dtd">

-<?Pub Inc?>

 <task id="tcrexxsd" xml:lang="en-us">

 <title>Generating XML files from XML schemas</title>

 <titlealts>

@@ -14,9 +13,13 @@
 associated with your XML schema, and contains at least some of the elements

 and attributes in your XML schema.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>XML files<indexterm>generating from XML schemas</indexterm></indexterm>

-<indexterm>XML schemas<indexterm>generating XML files</indexterm></indexterm>

-</keywords>

+<keywords><indexterm keyref="tcrexxsd|1|XMLfilesgeneratingfromXMLschemas"

+status="new">XML files<indexterm>generating from XML schemas</indexterm></indexterm>

+<indexterm keyref="tcrexxsd|2|XMLschemasgeneratingXMLfiles" status="changed">schemas<indexterm>generating

+XML files</indexterm></indexterm></keywords>

+</metadata><metadata>

+<keywords><indexterm keyref="tcrexxsd|11|XMLfilesschemas" status="new">XML

+files<indexterm>schemas</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context><p>After you have generated your XML file, you can further customize

@@ -72,7 +75,7 @@
 from a complex XML schema file, the XML file might not be valid. If this occurs,

 you can open the generated file in the XML editor and correct any errors that

 occur. Usually, only a few errors need to be fixed. The following XML schema

-constructs might present problems:</note><ul><?Pub Caret?>

+constructs might present problems:</note><ul>

 <li>Restrictions: sometimes restricted elements are erroneously generated. </li>

 <li>Facets: default generated data values might not conform to complex facets

 (for example, patterns).</li>

@@ -80,4 +83,3 @@
 </ul></result>

 </taskbody>

 </task>

-<?Pub *0000004762?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
index 27134c5..6a533af 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Generating XML files from XML schemas" />
 <meta name="abstract" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
 <meta name="description" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta content="XML files, generating from XML schemas, XML schemas, generating XML files" name="DC.subject" />
-<meta content="XML files, generating from XML schemas, XML schemas, generating XML files" name="keywords" />
+<meta content="XML files, generating from XML schemas, schemas, generating XML files, XML files" name="DC.subject" />
+<meta content="XML files, generating from XML schemas, schemas, generating XML files, XML files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
index dd1cebc..7a1b4c5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
@@ -2,7 +2,6 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "task.dtd">

-<?Pub Inc?>

 <task id="twmacro" xml:lang="en-us">

 <title>Working with XML templates</title>

 <titlealts>

@@ -13,8 +12,12 @@
 you have a certain piece of code you want to reuse several times, and you

 do not want to write it out every time.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>XML templates<indexterm>working with predefined code</indexterm></indexterm>

+<keywords><indexterm keyref="twmacro|1|XMLtemplatesworkingwithpredefinedcode"

+status="changed">templates<indexterm>working with predefined XML code</indexterm></indexterm>

 </keywords>

+</metadata><metadata>

+<keywords><indexterm keyref="twmacro|10|XMLfilestemplates" status="new">XML

+files<indexterm>templates</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context><p>You can use a default template as provided, customize that template,

@@ -43,7 +46,7 @@
 <step><cmd>If you want to insert a variable, click the <uicontrol>Insert Variable</uicontrol> button

 and select the variable to be inserted. </cmd><info>For example, the <b>date</b> variable

 indicates the current date will be inserted. </info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Apply<?Pub Caret?></uicontrol> to

+<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Apply</uicontrol> to

 save your changes.</cmd></step>

 </steps>

 <postreq>You can edit, remove, import, or export a template by using the same

@@ -55,4 +58,3 @@
 page.</p></postreq>

 </taskbody>

 </task>

-<?Pub *0000003238?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
index cd16ee4..2a953c3 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Working with XML templates" />
 <meta name="abstract" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
 <meta name="description" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="XML templates, working with predefined code" name="DC.subject" />
-<meta content="XML templates, working with predefined code" name="keywords" />
+<meta content="templates, working with predefined XML code, XML files" name="DC.subject" />
+<meta content="templates, working with predefined XML code, XML files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
 <meta content="XHTML" name="DC.Format" />
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
index 88fa958..6591db5 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
index de9744f..425b97a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

-org.eclipse.wst.xsdeditor.doc.user=org.eclipse.wst.xsdeditor.doc.user\n1.0.300.qualifier

+#Wed May 14 19:15:21 EDT 2008

+org.eclipse.wst.xsdeditor.doc.user=org.eclipse.wst.xsdeditor.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
index 93c25b2..68e3c64 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

+#Wed May 14 19:15:21 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
index 3951dc1..ebcea98 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
@@ -1,5 +1,5 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:16:38 EDT 2007

+#Wed May 14 19:15:21 EDT 2008

 /org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html=0

 /org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html=0

 /org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html=0

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments b/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
index 19b5d0c..4d3e424 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
index f143942..4cdd883 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
@@ -69,7 +69,7 @@
     </entry>
   </entry>
   <entry keyword="dependent artifacts">
-    <entry keyword="refactorting XML schema files">
+    <entry keyword="refactoring XML schema files">
       <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
     </entry>
   </entry>
@@ -83,7 +83,7 @@
       <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
     </entry>
   </entry>
-  <entry keyword="XML schemas">
+  <entry keyword="schemas">
     <entry keyword="editing">
       <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
     </entry>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
index f0a54c0..8736a4a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
@@ -11,10 +11,13 @@
 single artifact change, and have that change implemented throughout all other

 dependant artifacts.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>dependent artifacts<indexterm>refactorting XML schema

-files</indexterm></indexterm><indexterm>refactoring<indexterm>XML schema files</indexterm></indexterm>

-<indexterm>renaming<indexterm>XML schema files</indexterm></indexterm><indexterm>XML

-schemas<indexterm>editing</indexterm></indexterm></keywords>

+<keywords><indexterm keyref="trefactrXSD|1|dependentartifactsrefactortingXMLschemafiles"

+status="new">dependent artifacts<indexterm>refactoring XML schema files</indexterm></indexterm>

+<indexterm keyref="trefactrXSD|2|refactoringXMLschemafiles" status="new">refactoring<indexterm>XML

+schema files</indexterm></indexterm><indexterm keyref="trefactrXSD|3|renamingXMLschemafiles"

+status="new">renaming<indexterm>XML schema files</indexterm></indexterm><indexterm

+keyref="trefactrXSD|4|XMLschemasediting" status="changed">schemas<indexterm>editing</indexterm></indexterm>

+</keywords>

 </metadata></prolog>

 <taskbody>

 <prereq></prereq>

@@ -39,7 +42,7 @@
 </step>

 </steps>

 <result>The new name will be entered in the opened XSD source, as well as

-in all dependant artifacts.<?Pub Caret?></result>

+in all dependant artifacts.</result>

 <example><b><u>Component References in XML Schema</u></b><simpletable>

 <sthead>

 <stentry>Global named components</stentry>

@@ -93,4 +96,3 @@
 <postreq></postreq>

 </taskbody>

 </task>

-<?Pub *0000003205?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
index 442e591..5feb846 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Refactoring in XML Schema Files" />
 <meta name="abstract" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
 <meta name="description" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta content="dependent artifacts, refactorting XML schema files, refactoring, XML schema files, renaming, XML schemas, editing" name="DC.subject" />
-<meta content="dependent artifacts, refactorting XML schema files, refactoring, XML schema files, renaming, XML schemas, editing" name="keywords" />
+<meta content="dependent artifacts, refactoring XML schema files, refactoring, XML schema files, renaming, XML schema files, schemas, editing" name="DC.subject" />
+<meta content="dependent artifacts, refactoring XML schema files, refactoring, XML schema files, renaming, XML schema files, schemas, editing" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="refactoring" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -66,20 +66,20 @@
 
 <div class="example"><strong><u>Component References in XML Schema</u></strong><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
 <tr>
-<th valign="bottom" align="left" id="N100F5">Global named components</th>
+<th valign="bottom" align="left" id="N100FE">Global named components</th>
 
-<th valign="bottom" align="left" id="N100FB">Reference</th>
+<th valign="bottom" align="left" id="N10104">Reference</th>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N100F5"><ul>
+<td valign="top" headers="N100FE"><ul>
 <li>&lt;element name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100FB"><ul>
+<td valign="top" headers="N10104"><ul>
 <li>&lt;element ref="foo"&gt;</li>
 
 <li>&lt;element substitutionGroup="foo"</li>
@@ -90,13 +90,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100F5"><ul>
+<td valign="top" headers="N100FE"><ul>
 <li>&lt;simple/complexType name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100FB"><ul>
+<td valign="top" headers="N10104"><ul>
 <li>&lt;element type="foo"&gt;</li>
 
 <li>&lt;attribute type="foo"&gt;</li>
@@ -111,13 +111,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100F5"><ul>
+<td valign="top" headers="N100FE"><ul>
 <li>&lt;attribute name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100FB"><ul>
+<td valign="top" headers="N10104"><ul>
 <li>&lt;attribute ref="foo"&gt;</li>
 
 </ul>
@@ -126,13 +126,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100F5"><ul>
+<td valign="top" headers="N100FE"><ul>
 <li>&lt;attributeGroup name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100FB"><ul>
+<td valign="top" headers="N10104"><ul>
 <li>&lt;attributeGroup ref="foo"&gt;</li>
 
 </ul>
@@ -141,13 +141,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100F5"><ul>
+<td valign="top" headers="N100FE"><ul>
 <li>&lt;group name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100FB"><ul>
+<td valign="top" headers="N10104"><ul>
 <li>&lt;group ref="foo"&gt;</li>
 
 </ul>