diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
index 904f891..2f07600 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
@@ -4,46 +4,56 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<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="copyright" content="(C) Copyright IBM Corporation 2007" />
 <meta name="security" content="public" />
 <meta name="Robots" content="index,follow" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta name="DC.Format" content="XHTML" />
+<!-- All rights reserved. Licensed Materials Property of IBM -->
+<!-- US Government Users Restricted Rights -->
+<!-- Use, duplication or disclosure restricted by -->
+<!-- GSA ADP Schedule Contract with IBM Corp. -->
 <link rel="stylesheet" type="text/css" href="ibmdita.css" />
 <title>Index</title>
 </head>
 <body>
 <h1>Index</h1>
 <a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_45" href="#IDX1_45">E</a>
-<a name="IDX0_49" href="#IDX1_49">I</a>
+<a name="IDX0_50" href="#IDX1_50">P</a>
 <a name="IDX0_52" href="#IDX1_52">R</a>
 <a name="IDX0_58" href="#IDX1_58">X</a>
 <hr></hr>
 <strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
 <ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">dependant artifacts</a>
+<li>dependent artifacts
+<ul class="indexlist">
+<li><a href="topics/trefactrXSD.html#refactoring">refactorting XML schema files</a>
 </li>
 </ul>
-<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">editing XML schemas</a>
 </li>
 </ul>
-<strong><a name="IDX1_49" href="#IDX0_49">I</a></strong>
+<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
 <ul class="indexlist">
-<li>Icons
+<li>preferences
 <ul class="indexlist">
-<li><a href="topics/rxsdicons.html#ricons">XML schema editor</a>
+<li><a href="topics/tedtpref.html#tedtpref">XML schema files</a>
 </li>
 </ul>
 </li>
 </ul>
 <strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
 <ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">refactoring</a>
+<li>refactoring
+<ul class="indexlist">
+<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
 </li>
-<li><a href="topics/trefactrXSD.html#refactoring">renaming</a>
+</ul>
+</li>
+<li>renaming
+<ul class="indexlist">
+<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
+</li>
+</ul>
 </li>
 </ul>
 <strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
@@ -54,166 +64,22 @@
 </li>
 </ul>
 </li>
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema editor</a>
+<li>XML schema editor
 <ul class="indexlist">
-<li>adding
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">an any element</a>
+<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
+</li>
+<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
 </li>
 <li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
 </li>
-<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
-</li>
-<li><a href="topics/taddcmod.html#taddcmod">content models</a>
-</li>
-<li><a href="topics/taddelmr.html#taddelmr">element references</a>
-</li>
-<li><a href="topics/taddelm.html#taddelm">elements</a>
-</li>
-<li><a href="topics/taddglba.html#taddglba">global attributes</a>
-</li>
-<li><a href="topics/taddglem.html#taddglem">global elements</a>
-</li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group references</a>
-</li>
-<li><a href="topics/taddgrup.html#taddgrup">groups</a>
-</li>
-<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
-</li>
-<li><a href="topics/taddincl.html#taddincl">include elements</a>
-</li>
-<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
-</li>
-<li><a href="topics/taddrdfn.html#taddrdfn">redefine elements</a>
-</li>
-<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
-</li>
-</ul>
-</li>
-<li>an any element
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding</a>
-</li>
-</ul>
-</li>
-<li>attributes groups
-<ul class="indexlist">
-<li><a href="topics/taddagrp.html#taddagrp">adding</a>
-</li>
-</ul>
-</li>
 <li><a href="topics/rrefintg.html#rrefintg">clean up in</a>
 </li>
-<li>complex types
-<ul class="indexlist">
-<li><a href="topics/taddcmxt.html#taddcmxt">adding</a>
-</li>
-</ul>
-</li>
-<li>content models
-<ul class="indexlist">
-<li><a href="topics/taddcmod.html#taddcmod">adding</a>
-</li>
-</ul>
-</li>
-<li>deleting
-<ul class="indexlist">
-<li><a href="topics/tdelscmp.html#tdelscmp">components</a>
-</li>
-</ul>
-</li>
-<li>editing XML schemas
-<ul class="indexlist">
-<li><a href="topics/tedtschm.html#tedtschm">simple types</a>
-</li>
-</ul>
-</li>
-<li>element references
-<ul class="indexlist">
-<li><a href="topics/taddelmr.html#taddelmr">adding</a>
-</li>
-</ul>
-</li>
-<li>elements
-<ul class="indexlist">
-<li><a href="topics/taddelm.html#taddelm">adding</a>
-</li>
-</ul>
-</li>
-<li>global attributes
-<ul class="indexlist">
-<li><a href="topics/taddglba.html#taddglba">adding</a>
-</li>
-</ul>
-</li>
-<li>global elements
-<ul class="indexlist">
-<li><a href="topics/taddglem.html#taddglem">adding</a>
-</li>
-</ul>
-</li>
-<li>group references
-<ul class="indexlist">
-<li><a href="topics/taddgrpr.html#taddgrpr">adding</a>
-</li>
-</ul>
-</li>
-<li>groups
-<ul class="indexlist">
-<li><a href="topics/taddgrup.html#taddgrup">adding</a>
-</li>
-</ul>
-</li>
-<li><a href="topics/rxsdicons.html#ricons">icons</a>
-</li>
-<li>import elements
-<ul class="indexlist">
-<li><a href="topics/taddimpt.html#taddimpt">adding</a>
-</li>
-</ul>
-</li>
-<li>include elements
-<ul class="indexlist">
-<li><a href="topics/taddincl.html#taddincl">adding</a>
-</li>
-</ul>
-</li>
-<li><a href="topics/cxmlsced.html#cxmlsced">overview</a>
-</li>
-<li>pattern facets
-<ul class="indexlist">
-<li><a href="topics/taddreg.html#taddreg">adding</a>
-</li>
-</ul>
-</li>
-<li>redefine elements
-<ul class="indexlist">
-<li><a href="topics/taddrdfn.html#taddrdfn">adding</a>
-</li>
-</ul>
-</li>
-<li><a href="topics/rrefintg.html#rrefintg">referential integrity</a>
-</li>
-<li>simple types
-<ul class="indexlist">
-<li><a href="topics/taddsmpt.html#taddsmpt">adding</a>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
-<ul class="indexlist">
-<li>adding
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">an any element</a>
-</li>
-<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
-</li>
 <li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
 </li>
 <li><a href="topics/taddcmod.html#taddcmod">content models</a>
 </li>
+<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
+</li>
 <li><a href="topics/taddelmr.html#taddelmr">element references</a>
 </li>
 <li><a href="topics/taddelm.html#taddelm">elements</a>
@@ -222,141 +88,81 @@
 </li>
 <li><a href="topics/taddglem.html#taddglem">global elements</a>
 </li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group references</a>
+<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
 </li>
 <li><a href="topics/taddgrup.html#taddgrup">groups</a>
 </li>
+<li><a href="topics/rxsdicons.html#ricons">icons</a>
+</li>
 <li><a href="topics/taddimpt.html#taddimpt">import elements</a>
 </li>
 <li><a href="topics/taddincl.html#taddincl">include elements</a>
 </li>
+<li><a href="topics/cxmlsced.html#cxmlsced">overview</a>
+</li>
 <li><a href="topics/taddreg.html#taddreg">pattern facets</a>
 </li>
-<li><a href="topics/taddrdfn.html#taddrdfn">redefine elements</a>
+<li><a href="topics/rrefintg.html#rrefintg">referential integrity</a>
 </li>
 <li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
 </li>
+<li><a href="topics/tedtschm.html#tedtschm">XML schema properties</a>
+</li>
 </ul>
 </li>
-<li>an any element
+<li>XML schema files
 <ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding</a>
+<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
 </li>
-</ul>
+<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
 </li>
-<li>attributes groups
-<ul class="indexlist">
-<li><a href="topics/taddagrp.html#taddagrp">adding</a>
+<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
 </li>
-</ul>
+<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
 </li>
-<li>complex types
-<ul class="indexlist">
-<li><a href="topics/taddcmxt.html#taddcmxt">adding</a>
-</li>
-</ul>
-</li>
-<li>content models
-<ul class="indexlist">
-<li><a href="topics/taddcmod.html#taddcmod">adding</a>
-</li>
-</ul>
+<li><a href="topics/taddcmod.html#taddcmod">content models</a>
 </li>
 <li><a href="topics/tcxmlsch.html#tcxmlsch">creating</a>
 </li>
-<li>defining
-<ul class="indexlist">
-<li><a href="topics/tedtpref.html#tedtpref">default target namespace</a>
+<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
 </li>
-<li><a href="topics/tedtpref.html#tedtpref">schema prefix</a>
+<li><a href="topics/tedtpref.html#tedtpref">editing preferences</a>
 </li>
-</ul>
+<li><a href="topics/tedtschm.html#tedtschm">editing properties</a>
 </li>
-<li>deleting
-<ul class="indexlist">
-<li><a href="topics/tdelscmp.html#tdelscmp">components</a>
+<li><a href="topics/taddelmr.html#taddelmr">element references</a>
 </li>
-</ul>
+<li><a href="topics/taddelm.html#taddelm">elements</a>
 </li>
-<li>editing
-<ul class="indexlist">
-<li><a href="topics/tedtschm.html#tedtschm">simple types</a>
+<li><a href="topics/taddglba.html#taddglba">global attributes</a>
 </li>
-</ul>
+<li><a href="topics/taddglem.html#taddglem">global elements</a>
 </li>
-<li>element references
-<ul class="indexlist">
-<li><a href="topics/taddelmr.html#taddelmr">adding</a>
+<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
 </li>
-</ul>
+<li><a href="topics/taddgrup.html#taddgrup">groups</a>
 </li>
-<li>elements
-<ul class="indexlist">
-<li><a href="topics/taddelm.html#taddelm">adding</a>
-</li>
-</ul>
-</li>
-<li>global attributes
-<ul class="indexlist">
-<li><a href="topics/taddglba.html#taddglba">adding</a>
-</li>
-</ul>
-</li>
-<li>global elements
-<ul class="indexlist">
-<li><a href="topics/taddglem.html#taddglem">adding</a>
-</li>
-</ul>
-</li>
-<li>group references
-<ul class="indexlist">
-<li><a href="topics/taddgrpr.html#taddgrpr">adding</a>
-</li>
-</ul>
-</li>
-<li>groups
-<ul class="indexlist">
-<li><a href="topics/taddgrup.html#taddgrup">adding</a>
-</li>
-</ul>
-</li>
-<li>import elements
-<ul class="indexlist">
-<li><a href="topics/taddimpt.html#taddimpt">adding</a>
-</li>
-</ul>
+<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
 </li>
 <li><a href="topics/timpschm.html#timpschm">importing</a>
 </li>
-<li>include elements
-<ul class="indexlist">
-<li><a href="topics/taddincl.html#taddincl">adding</a>
-</li>
-</ul>
+<li><a href="topics/taddincl.html#taddincl">include elements</a>
 </li>
 <li><a href="topics/tnavsrc.html#tnavsrc">navigating</a>
 </li>
-<li>pattern facets
-<ul class="indexlist">
-<li><a href="topics/taddreg.html#taddreg">adding</a>
+<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
 </li>
-</ul>
-</li>
-<li>redefine elements
-<ul class="indexlist">
-<li><a href="topics/taddrdfn.html#taddrdfn">adding</a>
-</li>
-</ul>
-</li>
-<li>simple types
-<ul class="indexlist">
-<li><a href="topics/taddsmpt.html#taddsmpt">adding</a>
-</li>
-</ul>
+<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
 </li>
 <li><a href="topics/tvdtschm.html#tvdtschm">validating</a>
 </li>
 </ul>
 </li>
+<li>XML schemas
+<ul class="indexlist">
+<li><a href="topics/trefactrXSD.html#refactoring">editing</a>
+</li>
+</ul>
+</li>
 </ul>
 </body></html>
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 121377b..f143942 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <index>
   <entry keyword="XML schema files">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
     <entry keyword="creating">
       <topic href="topics/tcxmlsch.html#tcxmlsch" title="Creating XML schemas"/>
     </entry>
@@ -11,289 +10,146 @@
     <entry keyword="navigating">
       <topic href="topics/tnavsrc.html#tnavsrc" title="Navigating XML schemas"/>
     </entry>
-    <entry keyword="defining">
-      <entry keyword="default target namespace">
-        <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-      </entry>
-      <entry keyword="schema prefix">
-        <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-      </entry>
+    <entry keyword="editing preferences">
+      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
     </entry>
-    <entry keyword="editing">
-      <entry keyword="simple types">
-        <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-      </entry>
+    <entry keyword="editing properties">
+      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
     </entry>
-    <entry keyword="adding">
-      <entry keyword="attribute groups">
-        <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-      </entry>
-      <entry keyword="complex types">
-        <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-      </entry>
-      <entry keyword="content models">
-        <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-      </entry>
-      <entry keyword="an any element">
-        <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-      </entry>
-      <entry keyword="elements">
-        <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-      </entry>
-      <entry keyword="element references">
-        <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-      </entry>
-      <entry keyword="group references">
-        <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-      </entry>
-      <entry keyword="global attributes">
-        <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-      </entry>
-      <entry keyword="global elements">
-        <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-      </entry>
-      <entry keyword="groups">
-        <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-      </entry>
-      <entry keyword="import elements">
-        <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-      </entry>
-      <entry keyword="include elements">
-        <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-      </entry>
-      <entry keyword="redefine elements">
-        <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-      </entry>
-      <entry keyword="simple types">
-        <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-      </entry>
-      <entry keyword="pattern facets">
-        <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-      </entry>
-    </entry>
-    <entry keyword="attributes groups">
-      <entry keyword="adding">
-        <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-      </entry>
+    <entry keyword="attribute groups">
+      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
     </entry>
     <entry keyword="complex types">
-      <entry keyword="adding">
-        <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-      </entry>
+      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
     </entry>
     <entry keyword="content models">
-      <entry keyword="adding">
-        <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-      </entry>
+      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
     </entry>
-    <entry keyword="an any element">
-      <entry keyword="adding">
-        <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-      </entry>
+    <entry keyword="adding an any element">
+      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
     </entry>
     <entry keyword="elements">
-      <entry keyword="adding">
-        <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-      </entry>
+      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
     </entry>
     <entry keyword="element references">
-      <entry keyword="adding">
-        <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-      </entry>
+      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
     </entry>
-    <entry keyword="group references">
-      <entry keyword="adding">
-        <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-      </entry>
+    <entry keyword="group features">
+      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
     </entry>
     <entry keyword="global attributes">
-      <entry keyword="adding">
-        <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-      </entry>
+      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
     </entry>
     <entry keyword="global elements">
-      <entry keyword="adding">
-        <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-      </entry>
+      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
     </entry>
     <entry keyword="groups">
-      <entry keyword="adding">
-        <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-      </entry>
+      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
     </entry>
     <entry keyword="import elements">
-      <entry keyword="adding">
-        <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-      </entry>
+      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
     </entry>
     <entry keyword="include elements">
-      <entry keyword="adding">
-        <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-      </entry>
+      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
     </entry>
-    <entry keyword="redefine elements">
-      <entry keyword="adding">
-        <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-      </entry>
+    <entry keyword="adding redefine elements">
+      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
     </entry>
     <entry keyword="simple types">
-      <entry keyword="adding">
-        <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-      </entry>
+      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
     </entry>
     <entry keyword="pattern facets">
-      <entry keyword="adding">
-        <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-      </entry>
+      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
     </entry>
-    <entry keyword="deleting">
-      <entry keyword="components">
-        <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-      </entry>
+    <entry keyword="deleting components">
+      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
     </entry>
     <entry keyword="validating">
       <topic href="topics/tvdtschm.html#tvdtschm" title="Validating XML schemas"/>
     </entry>
   </entry>
+  <entry keyword="dependent artifacts">
+    <entry keyword="refactorting XML schema files">
+      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
+    </entry>
+  </entry>
+  <entry keyword="refactoring">
+    <entry keyword="XML schema files">
+      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
+    </entry>
+  </entry>
+  <entry keyword="renaming">
+    <entry keyword="XML schema files">
+      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
+    </entry>
+  </entry>
+  <entry keyword="XML schemas">
+    <entry keyword="editing">
+      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
+    </entry>
+  </entry>
+  <entry keyword="preferences">
+    <entry keyword="XML schema files">
+      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
+    </entry>
+  </entry>
   <entry keyword="XML schema editor">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    <entry keyword="editing XML schemas">
-      <entry keyword="simple types">
-        <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-      </entry>
+    <entry keyword="XML schema properties">
+      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
     </entry>
     <entry keyword="overview">
       <topic href="topics/cxmlsced.html#cxmlsced" title="XML schema editor"/>
     </entry>
-    <entry keyword="adding">
-      <entry keyword="attribute groups">
-        <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-      </entry>
-      <entry keyword="complex types">
-        <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-      </entry>
-      <entry keyword="content models">
-        <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-      </entry>
-      <entry keyword="an any element">
-        <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-      </entry>
-      <entry keyword="elements">
-        <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-      </entry>
-      <entry keyword="element references">
-        <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-      </entry>
-      <entry keyword="group references">
-        <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-      </entry>
-      <entry keyword="global attributes">
-        <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-      </entry>
-      <entry keyword="global elements">
-        <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-      </entry>
-      <entry keyword="groups">
-        <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-      </entry>
-      <entry keyword="import elements">
-        <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-      </entry>
-      <entry keyword="include elements">
-        <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-      </entry>
-      <entry keyword="redefine elements">
-        <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-      </entry>
-      <entry keyword="simple types">
-        <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-      </entry>
-      <entry keyword="pattern facets">
-        <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-      </entry>
-    </entry>
-    <entry keyword="attributes groups">
-      <entry keyword="adding">
-        <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-      </entry>
+    <entry keyword="attribute groups">
+      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
     </entry>
     <entry keyword="complex types">
-      <entry keyword="adding">
-        <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-      </entry>
+      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
     </entry>
     <entry keyword="content models">
-      <entry keyword="adding">
-        <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-      </entry>
+      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
     </entry>
-    <entry keyword="an any element">
-      <entry keyword="adding">
-        <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-      </entry>
+    <entry keyword="adding an any element">
+      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
     </entry>
     <entry keyword="elements">
-      <entry keyword="adding">
-        <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-      </entry>
+      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
     </entry>
     <entry keyword="element references">
-      <entry keyword="adding">
-        <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-      </entry>
+      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
     </entry>
-    <entry keyword="group references">
-      <entry keyword="adding">
-        <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-      </entry>
+    <entry keyword="group features">
+      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
     </entry>
     <entry keyword="global attributes">
-      <entry keyword="adding">
-        <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-      </entry>
+      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
     </entry>
     <entry keyword="global elements">
-      <entry keyword="adding">
-        <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-      </entry>
+      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
     </entry>
     <entry keyword="groups">
-      <entry keyword="adding">
-        <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-      </entry>
+      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
     </entry>
     <entry keyword="import elements">
-      <entry keyword="adding">
-        <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-      </entry>
+      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
     </entry>
     <entry keyword="include elements">
-      <entry keyword="adding">
-        <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-      </entry>
+      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
     </entry>
-    <entry keyword="redefine elements">
-      <entry keyword="adding">
-        <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-      </entry>
+    <entry keyword="adding redefine elements">
+      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
     </entry>
     <entry keyword="simple types">
-      <entry keyword="adding">
-        <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-      </entry>
+      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
     </entry>
     <entry keyword="pattern facets">
-      <entry keyword="adding">
-        <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-      </entry>
+      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
     </entry>
     <entry keyword="icons">
       <topic href="topics/rxsdicons.html#ricons" title="Icons used in the XML schema editor"/>
     </entry>
-    <entry keyword="deleting">
-      <entry keyword="components">
-        <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-      </entry>
+    <entry keyword="deleting components">
+      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
     </entry>
     <entry keyword="referential integrity">
       <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
@@ -302,23 +158,6 @@
       <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
     </entry>
   </entry>
-  <entry keyword="refactoring">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-  </entry>
-  <entry keyword="renaming">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-  </entry>
-  <entry keyword="editing XML schemas">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-  </entry>
-  <entry keyword="dependant artifacts">
-    <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-  </entry>
-  <entry keyword="Icons">
-    <entry keyword="XML schema editor">
-      <topic href="topics/rxsdicons.html#ricons" title="Icons used in the XML schema editor"/>
-    </entry>
-  </entry>
   <entry keyword="XML namespaces">
     <entry keyword="overview">
       <topic href="topics/rnmspc.html#rnmspc" title="XML namespaces"/>
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>