diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
index 60b1bfa..fe80409 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
@@ -8,7 +8,7 @@
 <shortdesc>XML schemas are an XML language for describing and constraining
 the content of XML files.</shortdesc>
 <conbody>
-<p>This sections contains information on the following:</p><?Pub Caret1?>
+<p>This sections contains information on the following:</p>
 </conbody>
 <related-links>
 <link href="tcxmlsch.dita"><linktext>Creating XML schemas</linktext></link>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
index 60b4ae4..9b3ad30 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
@@ -8,7 +8,7 @@
 <searchtitle>XML schema editor</searchtitle>
 </titlealts>
 <shortdesc>This product provides an XML schema editor for creating, viewing,
-and validating XML schemas. X<?Pub Caret1?>ML schemas are a formal specification
+and validating XML schemas. XML schemas are a formal specification
 of element names that indicates which elements are allowed in an XML file,
 and in which combinations. </shortdesc>
 <prolog><metadata>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
index 6903e72..f4a0b4f 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
@@ -13,7 +13,6 @@
 <meta name="description" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
 <meta content="XML namespaces, overview" name="DC.subject" />
 <meta content="XML namespaces, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rnmspc" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -268,10 +267,6 @@
 
 </div>
 
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
-</div>
-</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
index 284014b..93dea39 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
@@ -2,7 +2,7 @@
 <!--Arbortext, Inc., 1988-2005, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "reference.dtd">
-<reference id="ricons" xml:lang="en-us"><?Pub Caret1?>
+<reference id="ricons" xml:lang="en-us">
 <title>Icons used in the XML schema editor</title>
 <titlealts>
 <searchtitle>XML schema editor icons</searchtitle>
@@ -11,7 +11,7 @@
 and Properties view.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>icons</indexterm></indexterm>
-<indexterm>Icons<indexterm>XML schema editor</indexterm></indexterm></keywords>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section></section>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
index 17c19b2..336ae4e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
@@ -12,11 +12,8 @@
 can greatly facilitate the maintenance and reuse of common attribute declarations
 in an XML schema.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>attribute
-groups</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>attributes
-groups<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>attribute groups</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>attributes groups<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>attribute groups</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>attribute groups</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -78,7 +75,7 @@
 <info>The <codeph>any</codeph> appears below the attribute group in the Outline
 view. You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <uicontrol>namespace</uicontrol><?Pub Caret?> value, you can
+<choice>For a <uicontrol>namespace</uicontrol> value, you can
 select:<ul>
 <li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
 <li><b>##local </b>. This allows any well-formed XML that is not declared
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
index 702582d..5b2c285 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
@@ -13,10 +13,8 @@
 This enables you to include any well-formed XML content, such as an HTML Web
 page that conforms to XHTML 1.0 syntax.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>an any element</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>an any element<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>an any element</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>an any element<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>adding an any element</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>adding an any element</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -33,7 +31,7 @@
 <step><cmd>In the Outline view, right-click the content model that you want
 to work with and click <uicontrol>Add Any</uicontrol>. </cmd></step>
 <step><cmd>Select the new <codeph>any</codeph> element.</cmd></step>
-<step><cmd>In the Properties view of the schema editor, for a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value,
+<step><cmd>In the Properties view of the schema editor, for a <uicontrol>namespace</uicontrol> value,
 you can select:</cmd>
 <choices>
 <choice><b>##any</b>. This allows any well-formed XML from any namespace.</choice>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
index e283139..f5d45f7 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
@@ -14,11 +14,8 @@
 element, complex type, or group, which may be used to validate a document
 instance.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>content
-models</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>content
-models<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>content models</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>content models<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>content models</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>content models</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -65,7 +62,7 @@
 number of occurrences.</info></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this content model.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description.<?Pub Caret?></info>
+is used for human readable material, such as a description.</info>
 </step>
 <step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
 add application information elements to your annotations of schema components.</cmd>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
index 3d1f73f..ef5c946 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
@@ -12,11 +12,8 @@
 Complex types can be used to help determine the appropriate content for any
 instance documents generated from or associated with your XML schema.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>complex
-types</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>complex
-types<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML schema
-files<indexterm>adding<indexterm>complex types</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>complex types<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>complex types</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>complex types</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -76,7 +73,7 @@
 right-click in the complex type header, and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>
 <info>You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value, you can
+<choice>For a <uicontrol>namespace</uicontrol> value, you can
 select:<ul>
 <li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
 <li><b>##local </b>. This allows any well-formed XML that is not declared
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
index 3a0e0a8..57eeb53 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
@@ -12,10 +12,8 @@
 establish constraining relationships between related elements and attributes,
 and control the substitution of elements.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>elements<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>elements<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>elements</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>elements</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
index f2d6675..0a41c6a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
@@ -13,11 +13,8 @@
 element to appear in the instance document in the context of the referencing
 declaration.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>element
-references</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>element
-references<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>element references</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>element references<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>element references</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>element references</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -34,7 +31,7 @@
 <choices>
 <choice>Click the name of the element reference in the Design view. Enter
 the name of the element reference.</choice>
-<choice>Click the element reference type in the Design<?Pub Caret?> view.
+<choice>Click the element reference type in the Design view.
 Select a type from the menu, or select <uicontrol>Browse</uicontrol> for more
 options.</choice>
 </choices>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
index f975e1c..719033f 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
@@ -12,10 +12,8 @@
 in a document. Once declared, a global attribute can be referenced in one
 or more declarations using an attribute reference.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>global attributes</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>global attributes<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>global attributes</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>global attributes<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>global attributes</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>global attributes</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -30,7 +28,7 @@
 </step>
 <step><cmd>In the Properties view, you can select the attribute <uicontrol>Type</uicontrol> from
 the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>
-<info><p>Alternatively<?Pub Caret?>, you can select <uicontrol>Browse</uicontrol> from
+<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from
 the list for more options. </p><p>The Set Type dialog will appear, and lists
 all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
 the list by selecting one of the following options:<ul>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
index 6e0139d..1dfe97d 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
@@ -12,10 +12,8 @@
 has been declared as part of the main schema rather than as part of a content
 model.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>global elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>global elements<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>global elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>global elements<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>global elements</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>global elements</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -124,7 +122,7 @@
 right-click in the Attributes page and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>
 <info>You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value, you can
+<choice>For a <uicontrol>namespace</uicontrol> value, you can
 select:<ul>
 <li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
 <li><b>##local </b>. This allows any well-formed XML that is not declared
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
index 841870d..3aa051e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
@@ -12,10 +12,8 @@
 enables the referenced group to appear in the instance document in the context
 of the referencing declaration.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>group references</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>group references<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>group references</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>group references<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>group features</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>group features</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -31,7 +29,7 @@
 the <uicontrol>ref</uicontrol> list.</cmd></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this group reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description.<?Pub Caret?></info>
+is used for human readable material, such as a description.</info>
 </step>
 <step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
 add application information elements to your annotations of schema components.</cmd>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
index 215cf4a..5dce7f2 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
@@ -11,10 +11,8 @@
 The content model is a representation of any data that can be grouped together
 by the group, such as elements, element references, and group references.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>groups</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>groups<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>groups</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>groups<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>groups</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>groups</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -32,7 +30,7 @@
 is used for human readable material, such as a description.</info></step>
 <step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
 add application information elements to your annotations of schema components.</cmd>
-<info>The <uicontrol>Extensions</uicontrol><?Pub Caret?> page allows you to
+<info>The <uicontrol>Extensions</uicontrol> page allows you to
 specify the schema and add XML content to your annotations.</info></step>
 <step><cmd>In the Outline view, expand the <uicontrol>Groups</uicontrol> folder
 and your new group.</cmd></step>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
index c8f253e..0188c47 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
@@ -14,10 +14,8 @@
 bring in definitions and declarations from an imported schema into the current
 schema. </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>import elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>import elements<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>import elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>import elements<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>import elements</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>import elements</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -44,7 +42,7 @@
 </substep>
 </substeps>
 </step>
-<step><cmd>If you want to import an XML schema located on the Web:<?Pub Caret?></cmd>
+<step><cmd>If you want to import an XML schema located on the Web:</cmd>
 <substeps>
 <substep><cmd>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</cmd>
 </substep>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
index d52b832..bdc5924 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
@@ -11,15 +11,12 @@
 <shortdesc>As schemas become larger, it is often desirable to divide their
 content among several schema documents for purposes such as ease of maintenance,
 reuse, and readability. You can use the <codeph>include</codeph> element to
-bring<?Pub Caret?> in definitions and declarations from the included schema
+bring in definitions and declarations from the included schema
 into the current schema. The included schema must be in the same target namespace
 as the including schema. </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>include
-elements</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>include
-elements<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>include elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>include elements<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>include elements</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>include elements</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
index ee680ef..2728d05 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
@@ -12,10 +12,8 @@
 an entity or attribute. The most common uses of notations are to include familiar
 types of binary references, such as GIFs and JPGs, in an XML file.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>notations</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>notations<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>notations</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>notations<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>notations</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>notations</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -46,7 +44,7 @@
 <step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
 add application information elements to your annotations of schema components.</cmd>
 <info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
-schema and add XML content to your annotations.</info><?Pub Caret?></step>
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
index 00e7b41..78fc383 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
@@ -12,11 +12,8 @@
 simple and complex types, groups, and attribute groups obtained from external
 schema files. When you redefine a component, you are modifying its contents.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>redefine
-elements</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>redefine
-elements<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>redefine elements</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>redefine elements<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>adding redefine elements</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>adding redefine elements</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -34,7 +31,7 @@
 and click <uicontrol>Add Redefine</uicontrol>.</cmd></step>
 <step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image
 href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to
-<?Pub Caret?>the right of the <uicontrol>Schema location</uicontrol> field.</cmd>
+the right of the <uicontrol>Schema location</uicontrol> field.</cmd>
 <info>The XML schema file you select must have the same namespace as the current
 schema.</info></step>
 <step><cmd>If you want to select an XML schema located in the workbench, select <uicontrol>Workbench
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
index a0fc73b..3122220 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
@@ -11,11 +11,8 @@
 lexical space (the set of string literals that represent the values of a type),
 which indirectly constrains the value space.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>pattern
-facets</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>pattern
-facets<indexterm>adding</indexterm></indexterm></indexterm><indexterm>XML
-schema files<indexterm>adding<indexterm>pattern facets</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>pattern facets<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>pattern facets</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>pattern facets</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
@@ -53,7 +50,7 @@
 <step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult> The regular
 expression will appear in the Patterns page. <note type="tip"> To edit an
 existing pattern, select it in the Patterns page and click <uicontrol>Edit</uicontrol>.
-To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. <?Pub Caret?></note></stepresult>
+To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. </note></stepresult>
 </step>
 </steps>
 </taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
index 5321111..189a8ac 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
@@ -8,14 +8,12 @@
 <titlealts>
 <searchtitle>Adding simple types</searchtitle>
 </titlealts>
-<shortdesc>Simple types are used to create<?Pub Caret?> derived datatypes.
+<shortdesc>Simple types are used to create derived datatypes.
 They provide a set of constraints on the value space (a set of values) and
 the lexical space (a set of valid literals) of a datatype.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>adding<indexterm>simple types</indexterm></indexterm></indexterm>
-<indexterm>XML schema editor<indexterm>simple types<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>adding<indexterm>simple types</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>simple types<indexterm>adding</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>simple types</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>simple types</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
index 1ed3d1b..8c1475c 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
@@ -9,8 +9,8 @@
 <shortdesc>If you have created any XML schema components you no longer need,
 you can delete them.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>deleting<indexterm>components</indexterm></indexterm></indexterm>
-<indexterm>XML schema files<indexterm>deleting<indexterm>components</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema editor<indexterm>deleting components</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>deleting components</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
index 856072a..6276242 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
@@ -9,9 +9,8 @@
 <shortdesc>You can set various preferences for XML schema files such as the
 default target namespace and XML Schema language constructs prefix used.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema files<indexterm>defining<indexterm>default
-target namespace</indexterm></indexterm></indexterm><indexterm>XML schema
-files<indexterm>defining<indexterm>schema prefix</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML schema files<indexterm>editing preferences</indexterm></indexterm>
+<indexterm>preferences<indexterm>XML schema files</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <taskbody>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
index 847830e..666ecb8 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
@@ -11,9 +11,9 @@
 <shortdesc>After you create an XML schema, you can edit its various properties,
 such as its namespace and prefix.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema editor<indexterm>editing XML schemas<indexterm>simple
-types</indexterm></indexterm></indexterm><indexterm>XML schema files<indexterm>editing<indexterm>simple
-types</indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML schema editor<indexterm>XML schema properties</indexterm></indexterm>
+<indexterm>XML schema files<indexterm>editing properties</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
@@ -23,7 +23,7 @@
 <step><cmd>Create a new XML schema or double-click an existing schema in the
 Navigator view.</cmd><info> It will automatically open in the XML schema editor.</info>
 </step>
-<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol>.<?Pub Caret?></cmd>
+<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol>.</cmd>
 </step>
 <step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>
 </step>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
index 670f5d0..bc1b82a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
@@ -18,7 +18,7 @@
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p><p>To import an XML
-schema into the workbench<?Pub Caret?>:</p></context>
+schema into the workbench:</p></context>
 <steps>
 <step><cmd>Click <menucascade><uicontrol>File > Import</uicontrol></menucascade>.</cmd>
 </step>
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 0d1c0b0..eea3411 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
@@ -11,9 +11,11 @@
 single artifact change, and have that change implemented throughout all other
 dependant artifacts.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>XML schema files</indexterm><indexterm>XML schema editor</indexterm>
-<indexterm>refactoring</indexterm><indexterm>renaming</indexterm><indexterm>editing
-XML schemas</indexterm><indexterm>dependant artifacts</indexterm></keywords>
+<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>
 </metadata></prolog>
 <taskbody>
 <prereq></prereq>
@@ -30,7 +32,7 @@
 for that artifact</info>
 <substeps>
 <substep><cmd>Type in the new name of the artifact.</cmd></substep>
-<substep><cmd>(Optional) Click <b>Preview</b><?Pub Caret?>.</cmd><info>A window
+<substep><cmd>(Optional) Click <b>Preview</b>.</cmd><info>A window
 will open indicating all of the changes which will take place due to the refactoring.</info>
 </substep>
 <substep><cmd>Click <uicontrol>OK.</uicontrol></cmd></substep>