[185270] improving index terms, updating plugin ver numbers where necessary
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html
index 7e44f17..384cdcd 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.html
@@ -4,27 +4,74 @@
<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" />
-<link rel="stylesheet" type="text/css" href="swg_info_common.css" />
<title>Index</title>
</head>
<body>
<h1>Index</h1>
+<a name="IDX0_43" href="#IDX1_43">C</a>
+<a name="IDX0_44" href="#IDX1_44">D</a>
<a name="IDX0_45" href="#IDX1_45">E</a>
+<a name="IDX0_4C" href="#IDX1_4C">L</a>
+<a name="IDX0_50" href="#IDX1_50">P</a>
<a name="IDX0_58" href="#IDX1_58">X</a>
<hr></hr>
+<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
+<ul class="indexlist">
+<li>character encoding
+<ul class="indexlist">
+<li><a href="topics/cxmlenc.html#cxmlenc">text in files</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
+<ul class="indexlist">
+<li>DOCTYPE declarations
+<ul class="indexlist">
+<li><a href="topics/tedtdoc.html#tedtdoc">XML editor</a>
+</li>
+</ul>
+</li>
+<li>DTD
+<ul class="indexlist">
+<li><a href="topics/tcrexdtd.html#tcrexdtd">generating XML files</a>
+</li>
+</ul>
+</li>
+</ul>
<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
<ul class="indexlist">
-<li>Encodings
+<li>encodings
<ul class="indexlist">
-<li><a href="topics/cxmlenc.html#cxmlenc">HTML</a>
+<li><a href="topics/cxmlenc.html#cxmlenc">supported character sets</a>
</li>
-<li><a href="topics/cxmlenc.html#cxmlenc">XML</a>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_4C" href="#IDX0_4C">L</a></strong>
+<ul class="indexlist">
+<li>line delimiters
+<ul class="indexlist">
+<li><a href="topics/tedtenc.html#tedtenc">XML files</a>
+</li>
+</ul>
+</li>
+</ul>
+<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
+<ul class="indexlist">
+<li>preferences
+<ul class="indexlist">
+<li><a href="topics/txprefs.html#txprefs">XML editor</a>
</li>
</ul>
</li>
@@ -35,10 +82,6 @@
<ul class="indexlist">
<li><a href="topics/txmlcat.html#txmlcat">adding entries</a>
</li>
-<li><a href="topics/txmlcat.html#txmlcat">exporting entries</a>
-</li>
-<li><a href="topics/txmlcat.html#txmlcat">importing entries</a>
-</li>
<li><a href="topics/cxmlcat.html#cxmlcat">overview</a>
</li>
</ul>
@@ -47,65 +90,29 @@
<ul class="indexlist">
<li><a href="topics/twcdast.html#twcdast">content assist</a>
</li>
-<li>DOCTYPE declarations
-<ul class="indexlist">
-<li><a href="topics/tedtdoc.html#tedtdoc">editing</a>
-</li>
-</ul>
-</li>
-<li><a href="topics/txedttag.html#txedttag">editing</a>
-<ul class="indexlist">
-<li><a href="topics/twcdast.html#twcdast">content assist</a>
+<li><a href="topics/txedtdes.html#txedtdes">Design view</a>
</li>
<li><a href="topics/tedtdoc.html#tedtdoc">DOCTYPE declarations</a>
</li>
-<li><a href="topics/txedtdes.html#txedtdes">in the Design view</a>
-</li>
-<li><a href="topics/txedtsrc.html#txedtsrc">in the Source view</a>
-</li>
-<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
-</li>
-<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
-</li>
-<li><a href="topics/tedtcnst.html#tedtcnst">with DTD or XML schema constraints</a>
-</li>
-</ul>
+<li><a href="topics/tedtcnst.html#tedtcnst">editing with constraints</a>
</li>
<li><a href="topics/rxmlbicons.html#ricons">icons</a>
</li>
-<li>namespace information
-<ul class="indexlist">
-<li><a href="topics/tedtsch.html#tedtsch">editing</a>
-</li>
-</ul>
+<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
</li>
<li><a href="topics/cwxmledt.html#cwxmledt">overview</a>
</li>
-<li>processing instructions
-<ul class="indexlist">
-<li><a href="topics/tedtproc.html#tedtproc">editing</a>
+<li><a href="topics/txprefs.html#txprefs">preferences</a>
</li>
-</ul>
-</li>
-<li>setting
-<ul class="indexlist">
-<li><a href="topics/txprefs.html#txprefs">content assist rules</a>
-</li>
-<li><a href="topics/txprefs.html#txprefs">indentation style</a>
-</li>
-<li><a href="topics/txprefs.html#txprefs">line wrapping rules</a>
-</li>
-<li><a href="topics/tsugstrat.html#xmlsourcesuggestionstrategy">source suggestion strategy</a>
-</li>
-</ul>
+<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
</li>
<li><a href="topics/ttaghilt.html#ttaghilt">setting source highlighting styles</a>
</li>
-<li>updating
-<ul class="indexlist">
-<li><a href="topics/tedtgram.html#tedtgram">XML files with associated changes</a>
+<li><a href="topics/tsugstrat.html#xmlsourcesuggestionstrategy">source suggestion strategy</a>
</li>
-</ul>
+<li><a href="topics/txedtsrc.html#txedtsrc">Source view</a>
+</li>
+<li><a href="topics/tedtgram.html#tedtgram">updating XML files</a>
</li>
<li><a href="topics/txedttag.html#txedttag">XML files</a>
</li>
@@ -113,55 +120,25 @@
</li>
<li>XML files
<ul class="indexlist">
-<li><a href="topics/cxmlcat.html#cxmlcat">associating with DTDs</a>
+<li><a href="topics/cxmlcat.html#cxmlcat">associations</a>
</li>
-<li><a href="topics/cxmlcat.html#cxmlcat">associating with XML schemas</a>
+<li><a href="topics/twcdast.html#twcdast">content assist</a>
</li>
<li><a href="topics/tcretxml.html#tcretxml">creating</a>
</li>
-<li>DOCTYPE declarations
-<ul class="indexlist">
-<li><a href="topics/tedtdoc.html#tedtdoc">editing</a>
-</li>
-</ul>
-</li>
<li><a href="topics/txedttag.html#txedttag">editing</a>
-<ul class="indexlist">
-<li><a href="topics/twcdast.html#twcdast">content assist</a>
</li>
-<li><a href="topics/tedtdoc.html#tedtdoc">DOCTYPE declarations</a>
-</li>
-<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
-</li>
-<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
-</li>
-<li><a href="topics/tedtcnst.html#tedtcnst">with DTD or XML schema constraints</a>
-</li>
-</ul>
+<li><a href="topics/tedtcnst.html#tedtcnst">editing with constraints</a>
</li>
<li><a href="topics/tcrexdtd.html#tcrexdtd">generating from DTDs</a>
</li>
<li><a href="topics/tcrexxsd.html#tcrexxsd">generating from XML schemas</a>
</li>
-<li>namespace information
-<ul class="indexlist">
-<li><a href="topics/tedtsch.html#tedtsch">editing</a>
+<li><a href="topics/tedtsch.html#tedtsch">namespace information</a>
</li>
-</ul>
+<li><a href="topics/tedtproc.html#tedtproc">processing instructions</a>
</li>
-<li>processing instructions
-<ul class="indexlist">
-<li><a href="topics/tedtproc.html#tedtproc">editing</a>
-</li>
-</ul>
-</li>
-<li>specifying
-<ul class="indexlist">
-<li><a href="topics/tedtenc.html#tedtenc">encoding</a>
-</li>
-<li><a href="topics/tedtenc.html#tedtenc">line delimiters</a>
-</li>
-</ul>
+<li><a href="topics/tedtenc.html#tedtenc">specifying line delimiters</a>
</li>
<li><a href="topics/tedtgram.html#tedtgram">updating with associated changes</a>
</li>
@@ -169,17 +146,15 @@
</li>
</ul>
</li>
+<li>XML schemas
+<ul class="indexlist">
+<li><a href="topics/tcrexxsd.html#tcrexxsd">generating XML files</a>
+</li>
+</ul>
+</li>
<li>XML templates
<ul class="indexlist">
-<li><a href="topics/twmacro.html#twmacro">creating</a>
-</li>
-<li><a href="topics/twmacro.html#twmacro">editing</a>
-</li>
-<li><a href="topics/twmacro.html#twmacro">exporting</a>
-</li>
-<li><a href="topics/twmacro.html#twmacro">importing</a>
-</li>
-<li><a href="topics/twmacro.html#twmacro">removing</a>
+<li><a href="topics/twmacro.html#twmacro">working with predefined code</a>
</li>
</ul>
</li>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
index 891a57d..4b66584 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
@@ -2,7 +2,7 @@
<index>
<entry keyword="XML files">
<entry keyword="creating">
- <topic href="topics/tcretxml.html#tcretxml" title="Creating empty XML files"/>
+ <topic href="topics/tcretxml.html#tcretxml" title="Creating XML files"/>
</entry>
<entry keyword="generating from DTDs">
<topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
@@ -12,155 +12,113 @@
</entry>
<entry keyword="editing">
<topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
- <entry keyword="DOCTYPE declarations">
- <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
- </entry>
- <entry keyword="namespace information">
- <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
- </entry>
- <entry keyword="processing instructions">
- <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
- </entry>
- <entry keyword="content assist">
- <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
- </entry>
- <entry keyword="with DTD or XML schema constraints">
- <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
- </entry>
</entry>
- <entry keyword="specifying">
- <entry keyword="line delimiters">
- <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
- </entry>
- <entry keyword="encoding">
- <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
- </entry>
- </entry>
- <entry keyword="DOCTYPE declarations">
- <entry keyword="editing">
- <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
- </entry>
+ <entry keyword="specifying line delimiters">
+ <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
</entry>
<entry keyword="namespace information">
- <entry keyword="editing">
- <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
- </entry>
+ <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
</entry>
<entry keyword="processing instructions">
- <entry keyword="editing">
- <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
- </entry>
+ <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
+ </entry>
+ <entry keyword="content assist">
+ <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
+ </entry>
+ <entry keyword="editing with constraints">
+ <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
</entry>
<entry keyword="validating">
<topic href="topics/twxvalid.html#twxvalid" title="Validating XML files"/>
</entry>
- <entry keyword="associating with DTDs">
- <topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
- </entry>
- <entry keyword="associating with XML schemas">
+ <entry keyword="associations">
<topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
</entry>
<entry keyword="updating with associated changes">
<topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
</entry>
</entry>
- <entry keyword="XML editor">
- <entry keyword="editing">
- <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
- <entry keyword="in the Design view">
- <topic href="topics/txedtdes.html#txedtdes" title="Editing in the Design view"/>
- </entry>
- <entry keyword="DOCTYPE declarations">
- <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
- </entry>
- <entry keyword="namespace information">
- <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
- </entry>
- <entry keyword="processing instructions">
- <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
- </entry>
- <entry keyword="in the Source view">
- <topic href="topics/txedtsrc.html#txedtsrc" title="Editing in the Source view"/>
- </entry>
- <entry keyword="content assist">
- <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
- </entry>
- <entry keyword="with DTD or XML schema constraints">
- <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
- </entry>
+ <entry keyword="DTD">
+ <entry keyword="generating XML files">
+ <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
</entry>
+ </entry>
+ <entry keyword="XML schemas">
+ <entry keyword="generating XML files">
+ <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
+ </entry>
+ </entry>
+ <entry keyword="XML editor">
<entry keyword="XML files">
<topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
</entry>
<entry keyword="overview">
<topic href="topics/cwxmledt.html#cwxmledt" title="XML editor"/>
</entry>
- <entry keyword="setting">
- <entry keyword="line wrapping rules">
- <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
- </entry>
- <entry keyword="content assist rules">
- <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
- </entry>
- <entry keyword="indentation style">
- <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
- </entry>
- <entry keyword="source suggestion strategy">
- <topic href="topics/tsugstrat.html#xmlsourcesuggestionstrategy" title="Setting the XML source suggestion strategy used by content assist"/>
- </entry>
+ <entry keyword="preferences">
+ <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
</entry>
<entry keyword="setting source highlighting styles">
<topic href="topics/ttaghilt.html#ttaghilt" title="Setting source highlighting styles"/>
</entry>
+ <entry keyword="source suggestion strategy">
+ <topic href="topics/tsugstrat.html#xmlsourcesuggestionstrategy" title="Setting the XML source suggestion strategy used by content assist"/>
+ </entry>
+ <entry keyword="Design view">
+ <topic href="topics/txedtdes.html#txedtdes" title="Editing in the Design view"/>
+ </entry>
<entry keyword="DOCTYPE declarations">
- <entry keyword="editing">
- <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
- </entry>
+ <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
</entry>
<entry keyword="namespace information">
- <entry keyword="editing">
- <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
- </entry>
+ <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
</entry>
<entry keyword="processing instructions">
- <entry keyword="editing">
- <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
- </entry>
+ <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
+ </entry>
+ <entry keyword="Source view">
+ <topic href="topics/txedtsrc.html#txedtsrc" title="Editing in the Source view"/>
</entry>
<entry keyword="content assist">
<topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
</entry>
- <entry keyword="updating">
- <entry keyword="XML files with associated changes">
- <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
- </entry>
+ <entry keyword="editing with constraints">
+ <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
+ </entry>
+ <entry keyword="updating XML files">
+ <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
</entry>
<entry keyword="icons">
<topic href="topics/rxmlbicons.html#ricons" title="Icons used in the XML editor"/>
</entry>
</entry>
- <entry keyword="Encodings">
- <entry keyword="HTML">
- <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
+ <entry keyword="preferences">
+ <entry keyword="XML editor">
+ <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
</entry>
- <entry keyword="XML">
+ </entry>
+ <entry keyword="line delimiters">
+ <entry keyword="XML files">
+ <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
+ </entry>
+ </entry>
+ <entry keyword="character encoding">
+ <entry keyword="text in files">
<topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
</entry>
</entry>
+ <entry keyword="encodings">
+ <entry keyword="supported character sets">
+ <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
+ </entry>
+ </entry>
+ <entry keyword="DOCTYPE declarations">
+ <entry keyword="XML editor">
+ <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
+ </entry>
+ </entry>
<entry keyword="XML templates">
- <entry keyword="creating">
- <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
- </entry>
- <entry keyword="editing">
- <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
- </entry>
- <entry keyword="removing">
- <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
- </entry>
- <entry keyword="exporting">
+ <entry keyword="working with predefined code">
<topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
</entry>
</entry>
@@ -171,11 +129,5 @@
<entry keyword="adding entries">
<topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
</entry>
- <entry keyword="importing entries">
- <topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
- </entry>
- <entry keyword="exporting entries">
- <topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
- </entry>
</entry>
</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
index da19455..9019048 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
@@ -11,7 +11,7 @@
<link href="tcretxml.dita"><linktext>Creating empty XML files</linktext></link>
<link href="tcrexdtd.dita"><linktext>Generating XML files from a DTDs</linktext>
</link>
-<link href="tcrexxsd.dita"><linktext>Generating XML files from <?Pub Caret?>XML
+<link href="tcrexxsd.dita"><linktext>Generating XML files from XML
schemas</linktext></link>
</linklist>
</related-links>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
index 8e70cff..a6fa3e1 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
@@ -9,7 +9,7 @@
<related-links>
<linklist>
<link href="ccreatxm.dita"><linktext>Creating XML files</linktext></link>
-<link href="txedttag.dita"><linktext>Editing XML files</linktext><?Pub Caret1?>
+<link href="txedttag.dita"><linktext>Editing XML files</linktext>
</link>
<link href="twxvalid.dita"><linktext>Validating XML files</linktext></link>
<link href="cxmlcat.dita"><linktext>XML file associations with DTDs and XML
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
index 01ba074..34a2e0f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
@@ -48,7 +48,7 @@
</ul></p><p>The Design view is especially helpful if you are new to XML, or
need to do form-oriented editing. For example, you could use the Create XML
File wizard to create a template XML file for a job description form from
-a job description <?Pub Caret?>DTD. After those steps are completed, you would
+a job description DTD. After those steps are completed, you would
only have to fill in the form data using the Design view.</p><p>The following
links provide more information about the XML editor:</p></section>
</conbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
index 1a39f3c..fc8a56b 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
@@ -12,9 +12,9 @@
a valid XML file, a document must be accompanied by a DTD or an XML schema,
and conform to all of the declarations in the DTD or the XML schema.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML files<indexterm>associating with DTDs</indexterm></indexterm>
-<indexterm>XML files<indexterm>associating with XML schemas</indexterm></indexterm>
-<indexterm>XML catalog<indexterm>overview</indexterm></indexterm></keywords>
+<keywords><indexterm>XML catalog<indexterm>overview</indexterm></indexterm>
+<indexterm>XML files<indexterm>associations</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<conbody>
<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
index 72e3eac..21aa590 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
@@ -2,7 +2,7 @@
<!--Arbortext, Inc., 1988-2005, v.4002-->
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
<?Pub Inc?>
-<concept id="cxmlenc" xml:lang="en-us"><?Pub Caret?>
+<concept id="cxmlenc" xml:lang="en-us">
<title>XML and HTML encodings</title>
<titlealts>
<searchtitle>XML and HTML encodings</searchtitle>
@@ -10,7 +10,8 @@
<shortdesc>Encodings enable you to specify what character encoding your text
is in.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>Encodings<indexterm>HTML</indexterm></indexterm><indexterm>Encodings<indexterm>XML</indexterm></indexterm>
+<keywords><indexterm>character encoding<indexterm>text in files</indexterm></indexterm>
+<indexterm>encodings<indexterm>supported character sets</indexterm></indexterm>
</keywords>
</metadata></prolog>
<conbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
index a71e002..dbfc5b2 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
@@ -21,7 +21,7 @@
<p> The <b>DTD editor</b> is a tool for creating and viewing DTDs. </p>
<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating
XML schemas. You can use the XML schema editor to perform tasks such as creating
-XML schema components and importing and viewing XML schemas. </p><?Pub Caret1?>
+XML schema components and importing and viewing XML schemas. </p>
<p><b>Notes:</b></p>
<section>Exercise caution when opening large files with any of the XML editors.
If the memory limits of the workbench are exceeded, it will abruptly close
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
index 262d2ef..a398b07 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
@@ -17,7 +17,7 @@
<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
<tbody>
<row>
-<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry><?Pub Caret1?>
+<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry>
<entry colname="COLSPEC1" valign="bottom"><b>Description</b></entry>
</row>
<row>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
index 3260d3b..fe8a065 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
@@ -13,6 +13,7 @@
DTD.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML files<indexterm>generating from DTDs</indexterm></indexterm>
+<indexterm>DTD<indexterm>generating XML files</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
@@ -38,7 +39,7 @@
<choice><uicontrol>Create optional attributes</uicontrol>. Both mandatory
and optional attributes will be generated.</choice>
<choice><uicontrol>Create optional elements</uicontrol>. Both mandatory and
-optional elements will be generated.</choice><?Pub Caret1?>
+optional elements will be generated.</choice>
<choice><uicontrol>Create first choice of required choice</uicontrol>. The
first option of a required choice will be generated in your XML file.</choice>
<choice><uicontrol>Fill elements and attributes with data</uicontrol>. Any
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
index e1e1363..20df2b6 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
@@ -14,6 +14,7 @@
and attributes in your XML schema.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML files<indexterm>generating from XML schemas</indexterm></indexterm>
+<indexterm>XML schemas<indexterm>generating XML files</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
@@ -59,7 +60,7 @@
associated with the same namespace as its XML schema is associated with.</info>
</step>
<step><cmd>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd><?Pub Caret1?>
+with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>
</step>
<step><cmd>The <uicontrol>Location Hint</uicontrol> field contains the location
of the XML schema.</cmd></step>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
index f0de0c9..63f1b5c 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
@@ -11,9 +11,9 @@
can turn the constraints on and off to provide flexibility in the way you
edit, but still maintain the validity of the document periodically.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>with DTD or XML
-schema constraints</indexterm></indexterm></indexterm><indexterm>XML files<?Pub Caret?><indexterm>editing<indexterm>with
-DTD or XML schema constraints</indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>editing with constraints</indexterm></indexterm>
+<indexterm>XML files<indexterm>editing with constraints</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p> When the constraints are turned on, and you are working in the
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
index 84c5c2d..5f5a682 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
@@ -10,10 +10,8 @@
of it to associate it with a DTD file. You can edit your DOCTYPE declaration
to change the DTD file your XML file is associated with.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>DOCTYPE declarations</indexterm></indexterm></indexterm>
-<indexterm>XML editor<indexterm>DOCTYPE declarations<indexterm>editing</indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>editing<indexterm>DOCTYPE declarations</indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>DOCTYPE declarations<indexterm>editing</indexterm></indexterm></indexterm>
+<keywords><indexterm>DOCTYPE declarations<indexterm>XML editor</indexterm></indexterm>
+<indexterm>XML editor<indexterm>DOCTYPE declarations</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
index c48c98b..92ec6ed 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
@@ -9,10 +9,10 @@
<shortdesc>This page lets you specify the line delimiter and the text encoding
that will be used when you create or save an XML related file.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML files<indexterm>specifying <indexterm>line delimiters</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML files<indexterm>specifying line delimiters</indexterm></indexterm>
+<indexterm>line delimiters<indexterm>XML files</indexterm></indexterm>
</keywords>
-<keywords><indexterm>XML files<indexterm>specifying <indexterm>encoding</indexterm></indexterm></indexterm>
-</keywords>
+<keywords></keywords>
</metadata></prolog>
<taskbody>
<context><p>To specify the line delimiter you want to use:</p></context>
@@ -22,7 +22,7 @@
</step>
<step><cmd>In the <uicontrol>Line delimiter</uicontrol> list, select the operating
system that applies to your development or deployment platform. </cmd></step>
-<step><cmd>From the <uicontrol>Encoding</uicontrol><?Pub Caret?> field, specify
+<step><cmd>From the <uicontrol>Encoding</uicontrol> field, specify
the default character encoding set that is used when creating XML related
files (DTDs, XML files, XML schemas). Changing the encoding causes any new,
XML related files that are created from scratch to use the selected encoding.</cmd>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
index ff5dac1..83dc689 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
@@ -8,12 +8,12 @@
</titlealts>
<shortdesc>If you make changes to a DTD file or XML schema associated with
an XML file (that is currently open), click <uicontrol>XML > Reload Dependencies</uicontrol> to
-update the XML file with these changes. The changes will be reflected in <?Pub Caret?>the
+update the XML file with these changes. The changes will be reflected in the
guided editing mechanisms available in the editor, such as content assist.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>updating<indexterm>XML files with
-associated changes</indexterm></indexterm></indexterm><indexterm>XML files<indexterm>updating
-with associated changes</indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>updating XML files</indexterm></indexterm>
+<indexterm>XML files<indexterm>updating with associated changes</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p>For example, you have a DTD file called "Contact.dtd" and an XML
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
index 2a265fa..0450ec7 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
@@ -9,10 +9,8 @@
<shortdesc>If you have instructions you want to pass along to an application
using an XML document, you can use a processing instruction. </shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>processing instructions</indexterm></indexterm></indexterm>
-<indexterm>XML editor<indexterm>processing instructions<indexterm>editing </indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>editing<indexterm>processing instructions</indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>processing instructions<indexterm>editing</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML editor<indexterm>processing instructions</indexterm></indexterm>
+<indexterm>XML files<indexterm>processing instructions</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
index 87e2bf3..f016bfc 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
@@ -12,10 +12,8 @@
associated with or add a new association. Modifying any associations can impact
what content is allowed in the XML file.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>namespace information</indexterm></indexterm></indexterm>
-<indexterm>XML editor<indexterm>namespace information<indexterm>editing</indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>editing<indexterm>namespace information</indexterm></indexterm></indexterm>
-<indexterm>XML files<indexterm>namespace information<indexterm>editing</indexterm></indexterm></indexterm>
+<keywords><indexterm>XML editor<indexterm>namespace information</indexterm></indexterm>
+<indexterm>XML files<indexterm>namespace information</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
index 3bab9f0..2f5d1b5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
@@ -12,8 +12,8 @@
the suggestion strategy is set to "Lax", all suggestions will displayed in
the list with de-emphasized icons.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>setting<indexterm>source suggestion
-strategy<?Pub Caret?></indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>source suggestion strategy</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context>To set the suggestion strategy used by content assist:</context>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
index 7654c60..d150697 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
@@ -33,7 +33,7 @@
make the type bold.</cmd></step>
<step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting
styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <uicontrol>Content type </uicontrol> <?Pub Caret?>field,
+a particular content type, select it in the <uicontrol>Content type </uicontrol> field,
the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>
</step>
<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
index 65ece16..16ba4e3 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
@@ -11,10 +11,9 @@
code in the Source view of the XML editor. You can also use content assist
to insert templates into your XML code.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>content assist</indexterm></indexterm></indexterm>
-<indexterm>XML editor<indexterm>content assist</indexterm></indexterm><indexterm>XML
-files<indexterm>editing<indexterm>content assist</indexterm></indexterm></indexterm>
-</keywords><?Pub Caret1?>
+<keywords><indexterm>XML editor<indexterm>content assist</indexterm></indexterm>
+<indexterm>XML files<indexterm>content assist</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p>The placement of the cursor in your source file provides the context
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
index 78855c0..c7ebd9a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
@@ -11,10 +11,8 @@
you have a certain piece of code you want to reuse several times, and you
do not want to write it out every time.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML templates<indexterm>creating</indexterm></indexterm>
-<indexterm>XML templates<indexterm>editing</indexterm></indexterm><indexterm>XML
-templates<indexterm>removing</indexterm></indexterm><indexterm>XML templates<indexterm>importing</indexterm></indexterm>
-<indexterm>XML templates<indexterm>exporting</indexterm></indexterm></keywords>
+<keywords><indexterm>XML templates<indexterm>working with predefined code</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p>You can use a default template as provided, customize that template,
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
index 2294a11..09e77a0 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
@@ -25,7 +25,7 @@
validation on your documents.</p></context>
<steps>
<step><cmd>You can validate your file by selecting it in the Navigator view,
-right-clicking it, and clicking <uicontrol>Validate<?Pub Caret?></uicontrol>.</cmd>
+right-clicking it, and clicking <uicontrol>Validate</uicontrol>.</cmd>
</step>
</steps>
<result><p>Any validation problems are indicated in the Problems view. </p></result>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
index 0525eca..c0b5f94 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
@@ -13,8 +13,8 @@
while pop-up menus on the tree elements give alternatives that are valid for
that particular element.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>in the Design
-view</indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>Design view</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p> For example, the <uicontrol>Add child</uicontrol> menu item will
@@ -66,7 +66,7 @@
an attribute to the element that you selected. Any attributes you are allowed
to add to the element will be listed. After you have added the attribute to
the XML file, you can click in the right-hand column to change the value of
-the attribute. If the attribute has set values, they will appear in a list<?Pub Caret?>.</li>
+the attribute. If the attribute has set values, they will appear in a list.</li>
<li> <uicontrol>Add Child</uicontrol> - Click this to add another element,
a comment, or a processing instruction as a child of the parent element.</li>
<li> <uicontrol>Add Before</uicontrol> - Click this to add a child element,
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
index 21218b7..a453b10 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
@@ -9,8 +9,8 @@
<shortdesc>You can use the Source view to view and work with a file's source
code directly.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>editing<indexterm>in the Source
-view</indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>Source view</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p> The Source view has many text editing features, such as:</p><dl>
@@ -31,7 +31,7 @@
one character or set of selected characters at a time.</dd>
</dlentry><dlentry>
<dt>Content assist</dt>
-<dd>Content assist helps you finish tags and insert macros. <?Pub Caret?>Refer
+<dd>Content assist helps you finish tags and insert macros. Refer
to the related task for more details.</dd>
</dlentry><dlentry>
<dt>Template</dt>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
index d2b7603..df24fd5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
@@ -8,8 +8,8 @@
</titlealts>
<shortdesc>This file contains information about editing XML files.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML files<indexterm>editing</indexterm></indexterm><indexterm>XML
-editor<indexterm>editing</indexterm><indexterm>XML files</indexterm></indexterm>
+<keywords><indexterm>XML editor<indexterm>XML files</indexterm></indexterm>
+<indexterm>XML files<indexterm>editing</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
index bae28aa..828484f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
@@ -14,8 +14,6 @@
entry to find the location of the DTD or XML schema associated with the Key</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML catalog<indexterm>adding entries</indexterm></indexterm>
-<indexterm>XML catalog<indexterm>importing entries</indexterm></indexterm>
-<indexterm>XML catalog<indexterm>exporting entries</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
@@ -97,7 +95,7 @@
</substeps>
</step>
<step><cmd>Click <uicontrol>Import</uicontrol> if you want to import an .xmlcatalog
-file.<?Pub Caret?> You will be prompted to select the file you want to import.</cmd>
+file. You will be prompted to select the file you want to import.</cmd>
<substeps>
<substep><cmd>When you import a .xmlcatalog file, any entries in it will be
loaded into the XML Catalog (and any existing entries will be overwritten). </cmd>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
index a25f93e..1fa7ac5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
@@ -13,10 +13,9 @@
view for your XML document, and click <menucascade><uicontrol>Format</uicontrol>
<uicontrol>Document</uicontrol></menucascade>.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>XML editor<indexterm>setting<indexterm>line wrapping
-rules</indexterm></indexterm></indexterm><indexterm>XML editor<indexterm>setting<indexterm>content
-assist rules</indexterm></indexterm></indexterm><indexterm>XML editor<indexterm>setting<indexterm>indentation
-style</indexterm></indexterm></indexterm></keywords>
+<keywords><indexterm>XML editor<indexterm>preferences</indexterm></indexterm>
+<indexterm>preferences<indexterm>XML editor</indexterm></indexterm>
+</keywords>
</metadata></prolog>
<taskbody>
<context><p>To define XML preferences, perform the following steps:</p></context>