updated docs
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
new file mode 100644
index 0000000..6a742a4
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Creating XML files</title>
+</head>
+<body id="creatingxmlfiles"><a name="creatingxmlfiles"><!-- --></a>
+<h1 class="topictitle1">Creating XML files</h1>
+<div><p>This section contains information on creating XML files:</p>
+</div>
+<div>
+<div class="linklist">
+<div><a href="tcretxml.html" title="You can create a new, empty XML file, which you can then edit in the XML editor. When you create a new, empty XML file, it is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating empty XML files</a></div>
+<div><a href="tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from a DTDs</a></div>
+<div><a href="tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">
+ Generating XML files from XML schemas
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
new file mode 100644
index 0000000..afb687a
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>XML editor</title>
+</head>
+<title>Working with XML files</title>
+</head>
+<body id="workingwithxmlfiles"><a name="workingwithxmlfiles"><!-- --></a>
+<h1 class="topictitle1">Working with XML files</h1>
+<div><p>This section contains information on the following:</p>
+</div>
+<div>
+<div class="linklist">
+<div><a href="ccreatxm.html" title="This section contains information on creating XML files:">Creating XML files</a></div>
+<div><a href="txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
+<div><a href="twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
+<div><a href="cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered 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.">XML file associations with DTDs and XML
+schema</a></div>
+<div><a href="rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div></div>
+</div></body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html
deleted file mode 100644
index adb61e8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwwedtvw.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML editor integration with the workbench</title>
-</head>
-<body id="cwwedtvw"><a name="cwwedtvw"><!-- --></a>
-
-<h1 class="topictitle1">XML editor integration with the workbench</h1>
-<div><p>To edit a file using the XML editor, right-click the file in the
-Navigator view, and click <span class="uicontrol">Open With > XML Editor</span>. Because
-the editor that is last used to open a file becomes the default editor for
-that particular file, the XML editor will remain the default
-XML editor for that file unless you explicitly change it.</p><p>The Resource perspective is designed to facilitate XML development, so
-it contains certain views (such as the Outline and Properties view) that are
-advantageous to XML editor users. If, however, you prefer to work in a different
-perspective, that does not provide these views by default, you can add them
-by clicking <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Show View</span></span> and selecting the appropriate view.</p>
-<dl><dt class="bold">Outline view</dt>
-<dd>The Outline view provides a node-level outline, or roadmap of an XML file.
-This view is especially useful for navigating complex documents, because when
-you select an element in the Outline view, the corresponding nodes in the
-Source and Properties views are also identified as the "active" node. In addition,
-the Outline view is synchronized with the workbench Properties view, so that
-the selected element's attributes and their values are displayed in the Properties
-view (but not the Outline view). You can also use the Outline view to insert
-and delete elements.</dd>
-<dt class="bold">Properties view</dt>
-<dd>The <span class="uicontrol">Property</span> column in the Properties view contains
-a list of attributes, and the <span class="uicontrol">Value</span> column contains
-the editable values of those attributes. Attributes that are already included
-in the selected or "active" tag are displayed with their values. In addition,
-if the document contains a reference to a DTD or schema, then the attributes
-that are allowed for that tag are also displayed. When you select the value
-column of a property, you are provided with an editing option. <p>The pop-up
-menu in the Properties view contains the following options: undo, cut, copy,
-paste, delete, and select all. The options that are available at a given time
-depend on where the cursor is located when the pop-up menu is displayed. To
-see the pop-up menu options, the property value field must be active. (select
-the property, then select its value.)</p>
- <p>Use the <span class="uicontrol">Restore Default
-Value</span> toolbar button <img src="../images/nrstrval.gif" alt="Image of the Restore default values button" /> to
-change any value back to its default setting.</p>
- <p>Once you are in the Properties
-view, you can modify other property values for specific attributes. To edit
-another tag using the Properties view, you can select the desired node in
-the workbench Outline view, or select an attribute in the Design or Source
-view of the XML editor.</p>
-</dd>
-</dl>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
index b25a8bc..4691430 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
@@ -19,74 +19,63 @@
<body id="cwxmledt"><a name="cwxmledt"><!-- --></a>
<h1 class="topictitle1">XML editor</h1>
-<div><p>The XML editor is a tool for creating and viewing XML files</p><p>You can use it to perform a variety of tasks such as the following:</p>
-<ul><li>Create new XML files, either from scratch, existing DTDs, or existing
-XML schemas</li>
-<li>Edit and validate XML files</li>
-<li>Import existing XML files for structured viewing</li>
-<li>Associate XML files with DTDs or XML schemas</li>
+<div><p>The XML editor is a tool for creating and viewing XML files</p>
+
+<p>You can use it to perform a variety of tasks such as:</p>
+<ul><li>Creating new, empty XML files or generating them from existing DTDs or
+existing XML schemas</li>
+<li>Editing XML files</li>
+<li>Importing existing XML files for structured viewing</li>
+<li>Associating XML files with DTDs or XML schemas</li>
</ul>
-<p>To make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-> Preferences > Workbench > File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-<p>The XML editor has two main views - the Source view and the
-Design view.</p>
-<div class="skipspace"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
-and work directly with a file's source code directly.</p>
-<p>The Source view has many text editing
-features, such as syntax highlighting, unlimited undo/redo, and user-defined
-macros. Another helpful feature is content assist, which uses the information
-in a DTD or schema content model to provide a list of acceptable continuations
-depending on where the cursor is located in an XML file, or what has just
-been typed. The XML editor Source view also includes a "smart" double-clicking
-behavior. If your cursor is placed in an attribute value, one double-click
-selects that value, another double click selects the attribute-value pair,
-and a third double-click selects the entire tag. This makes it easier to copy
-and paste commonly used pieces of XML.</p>
+<p>The XML editor has two main views - the Source view and the Design view.
+You can also use the <strong>Outline</strong> view to insert and delete elements.</p>
+<div class="section"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
+and work directly with a file's source code. Many of the XML editing features
+in the XML editor Source view are very similar to those available in the Source
+view of Page Designer.</p>
+<div class="p">The Source view has many text editing features,
+such as: <ul><li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>
+<li> Content assist, which uses the information in a DTD or schema content
+model to provide a list of acceptable continuations depending on where the
+cursor is located in an XML file, or what has just been type</li>
+<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute
+value, one double-click selects that value, another double click selects the
+attribute-value pair, and a third double-click selects the entire tag. This
+makes it easier to copy and paste commonly used pieces of XML.</li>
+</ul>
</div>
-<div class="skipspace"><h4 class="sectiontitle">Design view</h4><p>The XML editor also has a Design view,
-which represents the XML file simultaneously as a table and a tree. This helps
-make navigation and editing easier. Content and attribute values can be edited
-directly in the table cells, while pop-up menus on the tree nodes give alternatives
-that are valid for that location. For example, the <span class="uicontrol">Add child</span> menu
-item will list only those elements from a DTD or XML schema which would be
-valid children at that point (as long as grammar constraints are on).</p>
+</div>
+<div class="section"><h4 class="sectiontitle">Design view</h4><div class="p">The XML editor also has a Design view.
+In it: <ul><li>The XML file is represented simultaneously as a table and a tree. This
+helps make navigation and editing easier.</li>
+<li>Content and attribute values can be edited directly in the table cells,
+while pop-up menus on the tree nodes give alternatives that are valid for
+that location. For example, the <span class="uicontrol">Add child</span> menu item
+will list only those elements from a DTD or XML schema which would be valid
+children at that point (as long as grammar constraints are on).</li>
+</ul>
+</div>
+<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 DTD. After those steps are completed, you
+would only have to fill in the form data using the Design view.</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
-DTD. After those steps are completed, you would only have to fill in the form
-data using the Design view.</p>
-<p> <b>Note</b>: You can also use the <b>Outline</b> view
-to insert and delete elements.</p>
+following links provide more information about the XML editor:</p>
</div>
</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/cwwedtvw.html">XML editor integration with the workbench</a></b><br />
-To edit a file using the XML editor, right-click the file in the
-Navigator view, and click <span class="uicontrol">Open With > XML Editor</span>. Because
-the editor that is last used to open a file becomes the default editor for
-that particular file, the XML editor will remain the default
-XML editor for that file unless you explicitly change it.</div>
-<div class="ulchildlink"><b><a href="../topics/txprefs.html">Defining XML editor preferences</a></b><br />
-You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/txedttag.html" title="">Editing XML files</a><br />
-</p>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
-<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
-<a href="../topics/twxvalid.html" title="Validating XML files"></a><br />
-</p>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered 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.">XML file associations with DTDs and XML schemas</a></div>
</div>
-</body>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tcretxml.html" title="You can create a new, empty XML file, which you can then edit in the XML editor. When you create a new, empty XML file, it is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating empty XML files</a></div>
+<div><a href="../topics/tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
+<div><a href="../topics/tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
+<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
+<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+<div><a href="../topics/twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
+</div>
+</div></body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
index 252b1a4..c42ca28 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
@@ -19,6 +19,10 @@
<body id="cxmlcat"><a name="cxmlcat"><!-- --></a>
<h1 class="topictitle1">XML file associations with DTDs and XML schemas</h1>
+<div><p>When an XML file is associated with a DTD or XML schema, it is
+bound by any structural rules contained in the DTD or XML schema. To be considered
+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.</p>
<div><p>There are two different ways to associate XML files with DTDs or
XML schemas.</p><ol><li>Direct association - The XML file contains either the name of a DTD in
its doctype declaration (for example, <!DOCTYPE root-element SYSTEM " <var class="varname">dtdfile.dtd</var>"
@@ -27,7 +31,7 @@
XML file root element (for example, <xsi:schemaLocation="http://www.ibm.com
<var class="varname">schema.xsd</var>">, where <var class="varname">schema.xsd</var> is
the name of the XML schema.</li>
-<li>XML Catalog entry - You can register DTD and XML schema files in
+<li>XML Catalog entry - You can register DTD and XML schema files in
the XML Catalog and associate them with a <var class="varname">Key</var> that represents
them. You can then refer to a DTD or XML schema file <var class="varname">Key</var> from
an XML file instead of referring directly to the DTD or XML schema file. An
@@ -35,7 +39,7 @@
XML schema) and a URI (which contains information about the DTD or XML schema
location).</li>
</ol>
-<div class="skipspace"><h4 class="sectiontitle">How an association works </h4><b>Associating an XML
+<div class="skipspace"><h4 class="sectiontitle">How an association works</h4><b>Associating an XML
file with a DTD </b><div class="p">If an XML file is associated with a DTD, a DOCTYPE
tag such as the following is included in the XML file:<pre><!DOCTYPE root-name PUBLIC "<var class="varname">InvoiceId</var>" "<var class="varname">C:\mydtds\Invoice.dtd</var>"></pre>
</div>
@@ -47,7 +51,7 @@
(which contains information about the location of Invoice.dtd) is used to
locate the DTD. Otherwise, the DOCTYPE's system identifier ( <var class="varname">"C:\mydtds\Invoice.dtd"</var>),
which refers directly to the file system location of the DTD, is used to locate
-the DTD. </p>
+the DTD.</p>
<p> <b>Note</b>: You can also use a system identifier as
a Key in an XML Catalog entry. If you use a system identifier as a Key, a
DOCTYPE tag such as the following is included in an XML file:</p>
@@ -62,12 +66,12 @@
shown below: </p>
<div class="p"> <b>Example 1 </b><pre><purchaseOrder xmlns="http://www.ibm.com"
xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd">
-<shipTo country="US">
+<shipTo country="US">
...</pre>
</div>
<div class="p"><b>Example 2 </b><pre><purchaseOrder xmlns="http://www.ibm.com"
xsi:schemaLocation="http://www.ibm.com PO.xsd">
-<shipTo country="US">
+<shipTo country="US">
....</pre>
</div>
<p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')
@@ -80,12 +84,12 @@
information about the location of PurchaseOrder.xsd) will be used to located
the XML schema.</p>
<p>In both examples, <samp class="codeph">http://www.ibm.com</samp> in
-the <samp class="codeph">xsi:schemaLocation</samp> tag is a URI that identifies the namespace
-for the XML schema. </p>
+the <samp class="codeph">xsi:schemaLocation</samp> tag is a URI that identifies
+the namespace for the XML schema.</p>
<div class="p">You can also use a namespace as a Key for
an XML Catalog entry. If you use a namespace as a Key, a schemaLocation tag
-such as the following is included in an XML file:<pre><purchaseOrder xmlns:="www.ibm.com"
- xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "></pre>
+such as the following is included in an XML file:<pre><purchaseOrder xmlns:="www.ibm.com"
+xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "></pre>
</div>
<p>The
schemaLocation attribute points to both the Key and the actual location of
@@ -112,23 +116,23 @@
<p><b>Note</b>: If you have an XML file
associated with an XML schema or DTD that is elsewhere in the network, and
you are working on a machine disconnected from the network, you can follow
-the steps described above if you want to use content assist or validate your
-XML file. </p>
+the steps described previously if you want to use content assist or validate
+your XML file. </p>
</div>
<div class="skipspace"><h4 class="sectiontitle">Advantages of XML Catalog entry associations</h4><p>If
you create a direct association between an XML file and an XML schema or DTD
file, any time you change the location of the schema or DTD you have to track
down and update all of the referencing XML files with the new location of
the DTD or schema. If, however, you associate an XML file with an XML schema
-or DTD Key, then, when you change the location of the schema or DTD, you only
-have to update the XML Catalog entry, instead of each individual XML file. </p>
+or DTD Key, then, when you change the location of the schema or DTD, you only
+ have to update the XML Catalog entry, instead of each individual XML file.</p>
<p>For
example, you have a DTD called "Building.dtd", which is associated with five
XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
You move the DTD file Building.dtd to a new location. If you have a direction
association between Building.dtd and all the XML files, you will have to update
the <DOCTTYPE> declaration in each XML file to reflect the new location
-of Building.dtd. If, however, you have an XML Catalog association, and
+of Building.dtd. If, however, you have an XML Catalog association, and
all the XML files just refer to the Key of Building.dtd, then you only have
to update the URI and all the XML files will point to the new location of
Building.dtd.</p>
@@ -147,29 +151,25 @@
Recherche en Informatique et en Automatique, Keio University).</p>
</div>
</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/txmlcat.html">Adding an entry to the XML Catalog</a></b><br />
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div><br/>
+<div><strong>Related tasks</strong><br/>
+ <a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">
+ Editing with DTD or XML schema constraints</a></div>
+ <div>
+ <a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing DOCTYPE declarations</a></div>
+ <div>
+ <a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+ <div>
+ <a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to 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.">Updating XML files with changes made to DTDs and schemas</a></div>
+ <div>
+ <a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
+ <div>
+ <a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
+ <div>
+ <a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
+ <div>
+ <a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
</div>
-<div class="ulchildlink"><b><a href="../topics/tedtgram.html">Updating XML files with changes made to DTDs and schemas</a></b><br />
-If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML > Reload Dependencies</span> to
-update the XML file with these changes.</div>
-</blockquote>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
-<a href="../topics/tedtproc.html" title="A processing instruction is a syntax in XML for passing instructions along to the application using an XML document.">Editing your XML processing instructions</a><br />
-<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
-</p>
-</div>
-</body>
+</div></body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
index a9e9c4d..ee7563a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
@@ -6,7 +6,7 @@
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+<meta name="security" content="public" />
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
@@ -19,10 +19,13 @@
<body id="cxmlenc"><a name="cxmlenc"><!-- --></a>
<h1 class="topictitle1">XML and HTML encodings</h1>
-<div><p>The HTML and XML editors support the following encodings. The IANA
-name is used in the encoding statement of an XML file, or charset directive
-in an HTML file.</p>
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" class="firstcol" id="d0e20"> <p><b>XML Encoding (IANA Name)</b></p>
+<div><p>Encodings enable you to specify what character encoding your text
+is in.</p>
+<p>The IANA name is used in the encoding statement of an XML file, or charset
+directive in an HTML file.</p>
+<p>The HTML and XML editors support the following encodings:</p>
+
+<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" class="firstcol" id="d0e31"> <p><strong>XML Encoding (IANA Name)</strong></p>
</th>
<th valign="top" id="d0e26"> <p><b>Description</b></p>
</th>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
index 0121591..7669633 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
@@ -20,19 +20,15 @@
<h1 class="topictitle1">XML tools - overview</h1>
<div><p>This product provides a comprehensive visual XML development environment.
-The tool set includes components for building DTDs, XML schemas, XML, and
-XSL files.</p><p>The following XML editor tools are available:</p>
+The tool set includes components for building DTDs, XML schemas, and XML files.</p><p>The following XML tools are available:</p>
<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You
can use it to create new XML files, either from scratch, existing DTDs, or
existing XML schemas. You can also use it to edit XML files, associate them
with DTDs or schemas, and validate them.</p>
-<p>The <b>DTD editor</b> is a tool for creating and viewing DTDs. Using the
-DTD editor, you can create DTDs, and generate XML schema files.</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, importing and viewing XML schemas, generating relational
-table definitions from XML schemas, and generating Java beans for creating
-XML instances of an XML schema.</p>
+<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>
<div class="skipspace">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
without saving any data (and without warning or error messages). The number
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
index 2cd4a96..cb72188 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
@@ -14,18 +14,18 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Extending the content model of an XML document</title>
+<!-- US Government Users Restricted Rights -->
+<title>Editing XML documents with multiple namespaces</title>
</head>
<body id="rextctn"><a name="rextctn"><!-- --></a>
-
-<h1 class="topictitle1">Extending the content model of an XML document</h1>
+<h1 class="topictitle1">Editing XML documents with multiple namespaces</h1>
<div><p>You can use the XML schema <samp class="codeph">any</samp> element to extend
the content model of an XML document.</p><div class="skipspace"><p>For example, you have an XML schema file called Book.xsd which
contains a complex type called BookType. BookType contains 4 elements (title,
author, year, and ISBN) and one <samp class="codeph">any</samp>element. The namespace
for the <samp class="codeph">any</samp> element is <samp class="codeph">##any</samp>. This means
that in an instance document, you can insert any XML element to extend the
-definition of the BookType. </p>
+definition of the BookType.</p>
<p>You can also provide a more specific
namespace. For example, you have another schema called My_Book.xsd, which
contains a complex type called My_BookType. My_BookType contains 4 elements
@@ -33,7 +33,7 @@
in this case the namespace for the BookType element is www.wesley.com. This
means that in an instance document, you can insert any XML element to extend
the definition of the BookType, provided that they belong to the namespace
-http://www.wesley.com. </p>
+http://www.wesley.com.</p>
</div>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
new file mode 100644
index 0000000..acb1cba
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Icons used in the XML editor</title>
+</head>
+<body id="ricons"><a name="ricons"><!-- --></a>
+<h1 class="topictitle1">Icons used in the XML editor</h1>
+<div><p>The following XML editor icons appear in the Outline and Design
+view.</p>
+
+<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><tbody><tr><td valign="bottom"><strong>Icon</strong> </td>
+<td valign="bottom"><strong>Description</strong></td>
+</tr>
+<tr><td valign="top"> <img src="../images/nattrib.gif" alt="This graphic is the attribute icon" /> </td>
+<td valign="top">attribute</td>
+</tr>
+<tr><td valign="top"> <img src="../images/cdatasection.gif" alt="This graphic is the character data icon" /></td>
+<td valign="top">character data (CDATA) section</td>
+</tr>
+<tr><td valign="top"> <img src="../images/comment_obj.gif" alt="This graphic is the comment icon" /></td>
+<td valign="top">comment</td>
+</tr>
+<tr><td valign="top"> <img src="../images/doctype.gif" alt="This graphic is the DOCTYPE icon" /></td>
+<td valign="top">DOCTYPE declaration</td>
+</tr>
+<tr><td valign="top"> <img src="../images/nelem.gif" alt="This graphic is the element icon" /> </td>
+<td valign="top">element</td>
+</tr>
+<tr><td valign="top"> <img src="../images/proinst_obj.gif" alt="This graphic is the processing instructions icon" /></td>
+<td valign="top">processing instructions</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
+</div>
+</div></body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
index c87997c..814fad3 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
@@ -10,51 +10,43 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
- * Contributors:
+<meta name="DC.Title" content="Creating empty XML files" />
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Creating an XML file from scratch</title>
+<title>Creating empty XML files</title>
</head>
<body id="tcretxml"><a name="tcretxml"><!-- --></a>
-
-<h1 class="topictitle1">Creating an XML file from scratch</h1>
-<div><p>You can create a new empty XML file, which you can then edit in
-the XML editor.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
+<h1 class="topictitle1">Creating empty XML files</h1>
+<div><p>You can create a new, empty XML file, which you can then edit in
+the XML editor. When you create a new, empty XML file, it is not associated
+with a DTD or XML schema file, so there are no restrictions on the kind of
+content it can contain.</p>
+<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To create an XML
file from scratch, follow these instructions:</p>
</div>
-<ol><li class="skipspace"><span>If necessary, create a project to contain the XML file. </span></li>
-<li class="skipspace"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">XML</span> > <span class="uicontrol">XML</span></span>. </span> If you cannot see the <span class="uicontrol">XML</span> option,
-select the <span class="uicontrol">Show All Wizards</span> check box.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>. </span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Create XML file from scratch</span> radio
+<ol><li class="skipspace"><span>If necessary, create a project to contain the XML file.</span></li>
+<li class="skipspace"><span>In the workbench, click <b> <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">XML</span> > <span class="uicontrol">XML</span></span></b>. </span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Next</span></b>.</span></li>
+<li class="skipspace"><span>Click the <b> <span class="uicontrol">Create XML file from scratch</span>
+</b>radio
button.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next.</span></span></li>
+<li class="skipspace"><span>Click <span class="uicontrol"><b>Next</b>.</span></span></li>
<li class="skipspace"><span>Select the project or folder that will contain the XML file.</span></li>
<li class="skipspace"><span>In the <span class="uicontrol">File name</span> field, type the name of
the XML file, for example <kbd class="userinput">MyXMLFile.xml</kbd>. The name of
your XML file <var class="varname">must</var> end in <kbd class="userinput">.xml</kbd>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Finish</span></b>.</span></li>
</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With > XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-> Preferences > Workbench > File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
-</div>
</div>
<div><p><b class="relconceptshd">Related concepts</b><br />
<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
</p>
<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcrexdtd.html" title="">Generating an XML file from a DTD </a><br />
+<a href="../topics/tcrexdtd.html" title="">Generating an XML file from a DTD</a><br />
<a href="../topics/tcrexxsd.html" title="">Generating an XML file from an XML schema</a><br />
<a href="../topics/txedttag.html" title="">Editing XML files</a><br />
</p>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
index a55ca56..d85a622 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
@@ -18,11 +18,14 @@
</head>
<body id="tcrexdtd"><a name="tcrexdtd"><!-- --></a>
-<h1 class="topictitle1">Generating an XML file from a DTD </h1>
-<div><div class="skipspace"><p>You can create an XML file from a DTD file. You can then further
-customize that file in the XML editor. Generating an XML file from a
-DTD can be useful if you want to quickly create an XML file that is based
-on your DTD file.</p>
+<h1 class="topictitle1">Generating XML files from DTDs</h1>
+<div><p>You can generate an XML file from your DTD if you want to quickly
+create an XML file based on your DTD file. Generating an XML file from your
+DTD saves you time by creating an XML file that is already associated with
+your DTD, and contains at least some of the elements and attributes in your
+DTD.</p>
+<div class="section"><p>After you have generated your XML file, you can further customize
+it in the XML editor.</p>
<p>The following instructions were written for the Resource
perspective, but they will also work in many other perspectives.</p>
<p>To
@@ -30,39 +33,34 @@
</div>
<ol><li class="skipspace"><span>In the Navigator view, right-click the DTD file that you want to
work with.</span></li>
-<li class="skipspace"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol">XML File</span></span>.</span></li>
+<li class="skipspace"><span>From its pop-up menu click <b> <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol">XML File</span></span></b>.</span></li>
<li class="skipspace"><span>Select a project or folder to contain the XML file and type a name
for it.</span> The name of the file must end in <kbd class="userinput">.xml</kbd>.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span> The root element of an XML file is the element that contains all other
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Next</span></b>.</span></li>
+<li class="skipspace"><span>Select the <b> <span class="uicontrol">Root element</span>
+</b>of the XML file.</span> The root element of an XML file is the element that contains all other
elements in that file. All the elements that you have defined in the DTD will
be shown in the<span class="uicontrol">Root element</span> list.</li>
-<li class="skipspace"><span>Select from the following content options: </span><ul><li><span class="uicontrol">Create optional attributes</span> - Both mandatory
-and optional attributes will be generated. </li>
-<li><span class="uicontrol">Create optional elements</span> - Both mandatory and
-optional elements will be generated. </li>
-<li><span class="uicontrol">Create first choice of required choice</span> -
+<li class="skipspace"><span>Select from the following content options: </span><ul><li>
+ <b><span class="uicontrol">Create optional attributes</span> </b>- Both
+ mandatory and optional attributes will be generated.</li>
+<li><b><span class="uicontrol">Create optional elements</span> </b>- Both
+mandatory and optional elements will be generated.</li>
+<li><b><span class="uicontrol">Create first choice of required choice</span></b> -
The first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span> - any
+<li><b><span class="uicontrol">Fill elements and attributes with data</span></b> - any
elements and attributes generated will be filled with sample data.</li>
</ul>
<p>If you do not select any of these options, then only the minimum
amount of content required for the XML file will be created.</p>
</li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span>.</span> You do not need to specify both. If you do, the
-Public ID will be used before the System ID. .</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
+<li class="skipspace"><span>Specify the <b> <span class="uicontrol">Public ID</span></b> or
+<b> <span class="uicontrol">System
+ID</span>.</b></span> You do not need to specify both. If you do, the Public ID will
+be used before the System ID. </li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Finish</span></b>.</span></li>
</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With > XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-> Preferences > Workbench > File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
+<div class="skipspace">
<p>The
XML file will only contain the selected root element and any elements or attributes
contained in the root element. You can now add elements, attributes, entities,
@@ -76,8 +74,8 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/tcrexxsd.html" title="Generating an XML file from an XML schema"></a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
+<a href="../topics/tcrexxsd.html" title="Generating an XML file from an XML schema">Generating an XML file from an XML schema</a><br />
+<a href="../topics/txedttag.html" title="Editing XML files">Editing XML files</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
index b8f8791..1bb9af0 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
@@ -18,12 +18,14 @@
</head>
<body id="tcrexxsd"><a name="tcrexxsd"><!-- --></a>
-<h1 class="topictitle1">Generating an XML file from an XML schema</h1>
-<div><div class="skipspace"><p>You can generate an XML file from an XML schema file. You can
-then further customize that file in the XML editor.</p>
-<p>Generating an XML
-file from an XML schema can be useful if you want to quickly create an XML
-file that is based on your XML schema.</p>
+<h1 class="topictitle1">Generating XML files from XML schemas</h1>
+<div><p>You can generate an XML file from your XML schema if you want to
+quickly create an XML file based on your XML schema file. Generating an XML
+file from your XML schema saves you time by creating an XML file that is already
+associated with your XML schema, and contains at least some of the elements
+and attributes in your XML schema.</p>
+<div class="section"><p>After you have generated your XML file, you can further customize
+it in the XML editor.</p>
<p>The following instructions were
written for the Resource perspective, but they will also work in many other
perspectives.</p>
@@ -32,47 +34,45 @@
</div>
<ol><li class="skipspace"><span>In the Navigator view, right-click the XML schema file that you
want to work with.</span></li>
-<li class="skipspace"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol">XML File</span></span>.</span></li>
+<li class="skipspace"><span>From its pop-up menu click <b> <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol">XML File</span></span></b>.</span></li>
<li class="skipspace"><span>Select a project or folder to contain the XML file and type a name
-for it.</span> The name of the file must end in<tt class="sysout">.xml.</tt> .</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Root element</span> of the XML file.</span> The root element of an XML file is the element that contains all other
+for it.</span> The name of the file must end in<tt class="sysout">.xml.</tt> </li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Next</span></b>.</span></li>
+<li class="skipspace"><span>Click the <b> <span class="uicontrol">Root element</span>
+</b>of the XML file.</span> The root element of an XML file is the element that contains all other
elements in that file. All of the global elements you have defined in the
-XML schema will be included in the Root Element list. If you do not have any
+XML schema will be included in the <b>Root Element </b>list. If you do not have any
global elements in your XML schema, you cannot create an XML file from it.</li>
-<li class="skipspace"><span>Select from the following content options: </span><ul><li><span class="uicontrol">Create optional attributes</span> - Both mandatory
+<li class="skipspace"><span>Select from the following content options: </span><ul><li>
+ <b><span class="uicontrol">Create optional attributes</span> </b>- Both mandatory
and optional attributes will be generated</li>
-<li><span class="uicontrol">Create optional elements</span> - Both mandatory and
+<li><b><span class="uicontrol">Create optional elements</span> </b>- Both mandatory and
optional elements will be generated.</li>
-<li><span class="uicontrol">Create first choice of required choice</span> -
+<li><b><span class="uicontrol">Create first choice of required choice</span></b> -
The first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span> - any
+<li><b><span class="uicontrol">Fill elements and attributes with data</span> </b>- any
elements and attributes generated will be filled with sample data.</li>
</ul>
If you do not select any of these options, then only the minimum amount
of content required for the XML file will be created.</li>
-<li class="skipspace"><span>The Namespace information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location.</span> For more information about namespaces and namespace prefixes, refer
-to the Related reference below. </li>
-<li class="skipspace"><span>Select the entry you want to edit and click <span class="uicontrol">Edit</span>. </span></li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
+<li class="skipspace"><span>The <b>Namespace</b> <b>information</b> section contains information about the
+target namespace of the XML schema, its prefix, and the schema location.</span>
+For more information about namespaces and namespace prefixes, refer to the
+Related reference below.</li>
+<li class="skipspace"><span>Select the entry you want to edit and click <b> <span class="uicontrol">Edit</span></b>.</span></li>
+<li class="skipspace"><span>The value in the <b> <span class="uicontrol">Namespace Name</span>
+</b>field is
the target namespace of the XML schema.</span> Your XML file should be
associated with the same namespace as its XML schema is associated with.</li>
<li class="skipspace"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Location Hint</span> field contains the location
+with the namespace will be prefixed with the <b> <span class="uicontrol">Prefix</span></b> value.</span></li>
+<li class="skipspace"><span>The <b> <span class="uicontrol">Location Hint</span>
+</b>field contains the location
of the XML schema.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>, then <span class="uicontrol">Finish</span>.</span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">OK</span></b>, then
+<b> <span class="uicontrol">Finish</span></b>.</span></li>
</ol>
-<div class="skipspace"><p>The XML file appears in the Navigator view and, by default, automatically
-opens in the XML source page editor. The XML source page editor offers limited
-functionality compared to the XML editor, so before editing the file, you
-should close it, then right-click the file in the Navigator view and click <span class="uicontrol">Open
-With > XML Editor</span> to open the file in the XML editor. </p>
-<p>To
-make the XML editor the default editor for XML files, select <span class="uicontrol">Window
-> Preferences > Workbench > File Associations</span>, then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML
-Editor</span> from the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
+<div class="skipspace">
<p>The
XML file will contain the selected root element and any elements or attributes
contained in the root element. It also contains information about the XML
@@ -96,8 +96,13 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tcretxml.html" title="You can create a new empty XML file, which you can then edit in the XML editor.">Creating an XML file from scratch</a><br />
-<a href="../topics/tcrexdtd.html" title="Generating an XML file from a DTD"></a><br />
-<a href="../topics/txedttag.html" title="Editing XML files"></a><br />
+<a href="../topics/tcrexdtd.html" title="Generating an XML file from a DTD">Generating an XML file from a DTD</a><br />
+<a href="../topics/txedttag.html" title="Editing XML files">Editing XML files</a><br />
+</p>
+
+<p><b class="reltaskshd">Related references</b><br />
+<a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML
+namespaces</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
index 1de0528..721e5f3 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
@@ -46,16 +46,16 @@
you turn the constraints of a DTD off:</p>
</div>
<ol><li class="skipspace"><span>Open the XML file in the XML editor (right-click the file in the
-Navigator view and click <span class="uicontrol">Open With > XML Editor</span>). </span></li>
+Navigator view and click <b> <span class="uicontrol">Open With > XML Editor</span></b>). </span></li>
<li class="skipspace"><span>For example, you have a DTD that specifies that an element requires
at least one of a specific child element: </span> <pre><!ELEMENT parentElement (childElement+)></pre>
</li>
<li class="skipspace"><span>If, in an XML file associated with your DTD, you attempt to remove
the final child element of the element with the DTD constraints turned on,
the editor will not allow you to do this, as it will make the document invalid.</span> You can confirm this by using the element's pop-up menu to verify that
-the<span class="uicontrol">Remove</span> option is grayed out.</li>
-<li class="skipspace"><span>To turn the DTD constraints off, click <span class="uicontrol">XML > Turn Grammar
-Constraints Off</span>. </span></li>
+the<span class="uicontrol"> <b>Remove</b></span> option is grayed out.</li>
+<li class="skipspace"><span>To turn the DTD constraints off, click <b> <span class="uicontrol">XML > Turn Grammar
+Constraints Off</span></b>. </span></li>
<li class="skipspace"><span>If you attempt to remove the same child element with constraints
off, the editor will allow you to.</span></li>
<li class="skipspace"><span>To correct the invalid document, you will have to re-add the necessary
@@ -74,9 +74,9 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
+<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog">Adding an entry to the XML Catalog</a><br />
<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
+<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with.?">Editing your namespace information</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
index e551b54..7bd2f9e 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
@@ -14,11 +14,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing your DOCTYPE declaration</title>
+<title>Editing DOCTYPE declarations</title>
</head>
-<body id="tedtdoc">
-
-<h1 class="topictitle1">Editing your DOCTYPE declaration</h1>
+<body id="tedtdoc"><a name="tedtdoc"><!-- --></a>
+<h1 class="topictitle1">Editing DOCTYPE declarations</h1>
<div><p>The DOCTYPE declaration in an XML file is used at the beginning
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.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
@@ -27,23 +26,29 @@
declaration, follow these steps:</p>
</div>
<ol><li class="skipspace"><span>In the Design view of the XML editor, right-click <span class="uicontrol">DOCTYPE</span> and
-click <span class="uicontrol">Edit DOCTYPE</span>.</span></li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">Root element mame</span> field
+click <b> <span class="uicontrol">Edit DOCTYPE</span></b>.</span></li>
+<li class="skipspace"><span>The value in the <b> <span class="uicontrol">Root element
+name</span></b> field
should match the root element of your XML file exactly.</span> You should
only edit the value in this field if your root element changes.</li>
-<li class="skipspace"><span>You can select a Public ID for any existing XML Catalog entries
-by clicking <span class="uicontrol">Browse</span>. </span> The value in the <span class="uicontrol">Public
-ID</span> field is the Public Identifier. It is used to associate the
+<li class="skipspace"><span>You can select a <b>Public ID</b> for any existing XML Catalog entries
+by clicking <b> <span class="uicontrol">Browse</span></b>. </span> The value in the
+<b> <span class="uicontrol">Public
+ID</span></b> field is the Public Identifier. It is used to associate the
XML file (using an XML Catalog entry) with a DTD file. For more information
on XML Catalog entries, refer to the related tasks below.</li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">System ID</span> field is the
+<li class="skipspace"><span>The value in the <b> <span class="uicontrol">System ID</span>
+</b>field is the
DTD the XML file is associated with. Type the path of the DTD file you want
the XML file associated with in this field. </span> <b>Note</b>: When
the XML file is processed by the XML processor, it will first try to use the
Public ID to locate the DTD, and if this fails, it will use the System ID
to find it.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">OK</span></b>.</span></li>
</ol>
+<div class="section">If you do not have a DOCTYPE declaration in your XML file, you can
+right-click in the Design view and click <b> <span class="uicontrol">Add DTD Information</span></b> to
+add one.</div>
</div>
<div>
@@ -53,8 +58,9 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
+<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog">Adding an entry to the XML Catalog</a><br />
+<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br>
+<a href="txedtdes.html">Editing in the XML design view</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
index 0301f7e..538ab08 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
@@ -17,19 +17,19 @@
<title>Specifying line delimiters</title>
</head>
<body id="tedtenc"><a name="tedtenc"><!-- --></a>
-
-<h1 class="topictitle1">Specifying line delimiters</h1>
+<h1 class="topictitle1">Specifying XML default encoding line delimiters</h1>
<div><p>Various development platforms use different line delimiters to
-indicate the start of a new line. Select the operating system that applies
-to your development or deployment platform.</p><div class="skipspace"><p>The following instructions were written for the
-XML perspective, but they will also work in many other perspectives.</p>
-<p>To
-specify the line delimiter you want to use:</p>
+indicate the start of a new line. You can select the appropriate operating
+system that applies to your development or deployment platform.</p>
+<div class="section"><p>The following instructions were written for the Resource perspective,
+but they will also work in many other perspectives.</p>
+<p>To specify the line
+delimiter you want to use:</p>
</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML files</span> > <span class="uicontrol">XML Files</span></span>.</span></li>
-<li><span>From the <span class="uicontrol">Line delimiter</span> field, select the
+<ol><li><span>Click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML files</span> > <span class="uicontrol">XML Files</span></span>.</b></span></li>
+<li><span>From the <b> <span class="uicontrol">Line delimiter</span> </b>field, select the
operating system that applies to your development or deployment platform. </span></li>
-<li><span>Click <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span>.</span></li>
+<li><span>Click <b> <span class="uicontrol">Apply</span></b>, then <b> <span class="uicontrol">OK</span></b>.</span></li>
</ol>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
index 1543d74..a23b95f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
@@ -20,8 +20,9 @@
<h1 class="topictitle1">Updating XML files with changes made to DTDs and schemas</h1>
<div><p>If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML > Reload Dependencies</span> to
-update the XML file with these changes.</p><div class="skipspace"><p>The changes will be reflected in the guided editing mechanisms
+an XML file (that is currently open), click <b> <span class="uicontrol">XML > Reload Dependencies</span>
+ </b>to
+update the XML file with these changes.</p><div class="skipspace"><p>The changes will be reflected in the guided editing mechanisms
available in the editor, such as content assist.</p>
<p>For example, you have
a DTD file called "Contact.dtd" and an XML file called "Contact.xml" associated
@@ -31,8 +32,8 @@
remove the child element <span class="uicontrol">Email</span> from the DTD, you will
no longer be able to add an <span class="uicontrol">Email</span> child element to
your root element Contact in your Contact.xml file. This change, however,
-will not come into effect until you save your changes in the DTD and click <span class="uicontrol">XML
-> Reload Dependencies</span> in the XML editor. Until you click it, you
+will not come into effect until you save your changes in the DTD and click <b> <span class="uicontrol">XML
+> Reload Dependencies</span></b> in the XML editor. Until you click it, you
will still be able to add <span class="uicontrol">Email</span> elements to Contact.xml.</p>
<p>This
feature is very handy when you are making updates to both DTDs and XML schemas
@@ -48,8 +49,8 @@
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing your DOCTYPE declaration</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
+<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog">Adding an entry to the XML Catalog</a><br />
+<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with.?">Editing your namespace information</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
index 5f6f40d..7abf218 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
@@ -14,24 +14,30 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Editing your XML processing instructions</title>
+<title>Editing XML processing instructions</title>
</head>
<body id="tedtproc"><a name="tedtproc"><!-- --></a>
-<h1 class="topictitle1">Editing your XML processing instructions</h1>
-<div><p>A processing instruction is a syntax in XML for passing instructions
-along to the application using an XML document.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
+<h1 class="topictitle1">Editing XML processing instructions</h1>
+<div><p>If you have instructions you want to pass along to an application
+using an XML document, you can use a processing instruction. </p>
+<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To edit a processing
instruction, follow these steps:</p>
</div>
-<ol><li><span>In the Design view of the XML editor, right-click
-your processing instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.</span></li>
-<li><span>The <span class="uicontrol">Target</span> field is used to identify the
+<ol><li><span>In the Design view of the XML editor, right-click your processing
+instruction, and click <b> <span class="uicontrol">Edit Processing Instruction</span></b>.</span></li>
+<li><span>The <b> <span class="uicontrol">Target</span></b> field is used to identify the
application the instructions belongs to.</span></li>
-<li><span>The <span class="uicontrol">Data</span> field contains the instructions.</span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
+<li><span>The <b> <span class="uicontrol">Data</span></b> field contains the instructions.</span></li>
+<li><span>Click <b> <span class="uicontrol">OK</span></b>.</span></li>
</ol>
-</div>
-</body>
+<div class="section">To create a new processing instruction, right-click in the Design
+view, and click <b> <span class="uicontrol">Add Child</span></b>, <b> <span class="uicontrol">Add Before</span></b> or
+ <b> <span class="uicontrol">Add
+After</span></b>, then click <b> <span class="uicontrol">Add Processing Instruction</span></b>.<p>
+ <p></b><strong>Related tasks</strong><br/>
+ <a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div></div>
+</p></body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
index 4313613..287a3d8 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
@@ -19,34 +19,42 @@
<body id="tedtsch"><a name="tedtsch"><!-- --></a>
<h1 class="topictitle1">Editing your namespace information</h1>
-<div><p>Your namespace information is used to provide various information
-about the XML file, such as the XML schema it is associated with. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
+<div><p>Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file
+is associated with or add a new association. Modifying any associations can
+impact what content is allowed in the XML file.</p>
+<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To edit your schema
information, follow these steps:</p>
</div>
<ol><li class="skipspace"><span>In the Design view of the XML editor, right-click
-your root element and click <span class="uicontrol">Edit Namespaces</span>.</span></li>
+your root element and click <b> <span class="uicontrol">Edit Namespaces</span></b>.</span></li>
<li class="skipspace"><span>Your XML file may be associated with more than one namespace or
-schema.</span> Select the entry you want to edit and click <span class="uicontrol">Edit</span>.</li>
-<li class="skipspace"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
+schema.</span> Select the entry you want to edit and click <b> <span class="uicontrol">Edit</span></b>.</li>
+<li class="skipspace"><span>The value in the <b> <span class="uicontrol">Namespace Name</span></b> field is
a namespace the XML file is associated with.</span> Your XML file should
be associated with the same namespace(s) its XML schema is associated with.
For more information about namespaces, refer to the related reference.</li>
<li class="skipspace"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Location Hint</span> field contains the location
+with the namespace will be prefixed with the <b> <span class="uicontrol">Prefix</span></b> value.</span></li>
+<li class="skipspace"><span>The <b> <span class="uicontrol">Location Hint</span>
+</b>field contains the location
of the XML schema the XML file is associated with.</span> An XML Catalog
-Key or a namespace name can be specified in this field. Click <span class="uicontrol">Browse</span> to
-view all XML schemas in the workbench and XML Catalog. </li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>, then click <span class="uicontrol">OK</span> again.</span></li>
+Key or a namespace name can be specified in this field. Click <b> <span class="uicontrol">Browse</span></b>
+to view all XML schemas in the workbench and XML Catalog.</li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">OK</span></b>, then click
+<b> <span class="uicontrol">OK</span></b> again.</span></li>
</ol>
-<div class="skipspace"><p>If you want to create a new association, click <span class="uicontrol">Add</span> instead
-of <span class="uicontrol">Edit</span>. You can then either click the <span class="uicontrol">Specify
-From Registered Namespace</span> radio button and select the namespace
-declarations you want to add or click the <span class="uicontrol">Specify New Namespace</span> radio
+<div class="skipspace"><p>If you want to create a new association, click <b> <span class="uicontrol">Add</span></b> instead
+of <b> <span class="uicontrol">Edit</span></b>. You can then either click the <span class="uicontrol">S<b>pecify
+From Registered Namespace</b></span> radio button and select the namespace
+declarations you want to add or click the <b> <span class="uicontrol">Specify New Namespace</span></b> radio
button and fill in the fields as necessary. </p>
</div>
+<div class="section">If you do not have namespace information in your XML file, you
+can right-click your root element in the Design view and click <b> <span class="uicontrol">Edit
+Namespaces</span></b> to add it. If you do not have a root element, you must
+create one before you can add the namespace information.</div>
</div>
<div>
@@ -56,9 +64,12 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
-<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog"></a><br />
+<a href="../topics/txmlcat.html" title="Adding an entry to the XML Catalog">Adding an entry to the XML Catalog</a><br />
<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
+<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a>
</p>
-</div>
+<p><strong>Related information</strong><br />
+<a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a></div>
+</p>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
index fd3c5bb..ba3e727 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
@@ -19,26 +19,31 @@
<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
<h1 class="topictitle1">Setting source highlighting styles</h1>
-<div><p>You can change how the XML source code is displayed in the Source
-view of the XML editor. </p><div class="skipspace"><p>To set highlighting styles for the XML code, follow these steps:</p>
+<div><p>If desired, you can change various aspects of how the XML source
+code is displayed in the Source view of the XML editor, such as the colors
+the tags will be displayed in.</p>
+ </p><div class="skipspace"><p>To set highlighting styles for the XML code, follow these steps:</p>
</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol"> XML
-Styles</span></span>.</span></li>
-<li><span>In the <span class="uicontrol">Content type</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also
+<ol><li><span>Click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol"> XML
+Styles</span></span></b>.</span></li>
+<li><span>In the <b> <span class="uicontrol">Content type</span></b> list, select the source
+tag type that you wish to set a highlighting style for. You can also
click text in the sample text to specify the source tag type that you wish
to set a highlighting style for.</span></li>
-<li><span>Click the <span class="uicontrol">Foreground</span> box.</span></li>
+<li><span>Click the <b> <span class="uicontrol">Foreground</span></b> box.</span></li>
<li><span>Select the color that you want the text of the tag to appear in
-and click <span class="uicontrol">OK</span>.</span></li>
-<li><span>Click the<span class="uicontrol">Background</span> box.</span></li>
-<li><span>Select the color that you want to appear behind the tag and click<span class="uicontrol">OK</span>. </span></li>
-<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
+and click <b> <span class="uicontrol">OK</span></b>.</span></li>
+<li><span>Click the<span class="uicontrol"> <b>Background</b></span> box.</span></li>
+<li><span>Select the color that you want to appear behind the tag and click<span class="uicontrol">
+<b>OK</b></span>.</span></li>
+<li><span>Select the <b> <span class="uicontrol">Bold</span></b> check box if you want to
make the type bold.</span></li>
-<li><span>Click <span class="uicontrol">Restore Defaults</span> to set
+<li><span>Click <b> <span class="uicontrol">Restore Defaults</span></b> to set
the highlighting styles back to their default values.</span></li>
-<li><span>Click <span class="uicontrol">OK</span> to save your changes. </span></li>
+<li><span>Click <b> <span class="uicontrol">OK</span></b> to save your changes.</span></li>
</ol>
</div>
-</body>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+</div>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
index d9eaeb3..1b7cacb 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
@@ -30,15 +30,17 @@
to insert macros into your XML code. The placement of the cursor in your source
file provides the context for the content assist to offer suggestions for
completion.</p><div class="skipspace"><p>You can launch content assist in any of the following ways:</p>
-<ul><li>From the <span class="uicontrol">Edit</span> menu, click <span class="uicontrol">Content Assist</span>,
+<ul><li>From the <b> <span class="uicontrol">Edit</span></b> menu, click <b> <span class="uicontrol">Content Assist</span>,</b>
or</li>
-<li>Press Ctrl+Space, or</li>
+<li>Press <b>Ctrl+Space</b></li>
</ul>
<p>In addition, you can set up an option that causes content assist to
pop up automatically when certain characters are typed. To set up this option,
-click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol"> Preferences</span></span> to open the Preferences window, then click <span class="menucascade"><span class="uicontrol">Web
-and XML</span> > <span class="uicontrol">XML Files </span> > <span class="uicontrol">XML Source</span></span> . In the <span class="uicontrol">Content assist</span> group box, select
-the <span class="uicontrol">Automatically make suggestions</span> check box, and supply
+click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol"> Preferences</span></span></b> to open the Preferences window, then click
+<b> <span class="menucascade"><span class="uicontrol">Web
+and XML</span> > <span class="uicontrol">XML Files </span> > <span class="uicontrol">XML Source</span></span></b>. In the
+<b> <span class="uicontrol">Content assist</span> </b>group box, select
+the <b> <span class="uicontrol">Automatically make suggestions</span></b> check box, and supply
any additional characters that should trigger content assist.</p>
<p>If your
cursor is in a position where content assist is available, a pop-up list of
@@ -46,7 +48,7 @@
based on the context and whether a DTD or XML schema is associated with the
XML file being edited. For example, if you have an Address element that can
contain any of the following children elements: Name, Street, City, Zip Code,
-Country, and Province, if you place your cursor after any of them and launch
+Country, and Province, and you place your cursor after any of them and launch
content assist, all of the child elements will be listed in the content assist
list.</p>
<p>The content assist list displays all valid tags for the current
@@ -63,5 +65,8 @@
want to use by double-clicking on it. </p>
</div>
</div>
-</body>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
+</div>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
index 98a950a..345e9b5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
@@ -20,41 +20,50 @@
<h1 class="topictitle1">Working with XML templates</h1>
<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You can use the default template as
-provided, customize that template, or create your own templates.</p><div class="skipspace">For example, you may work on a group of XML pages that should all
+code that you can insert into a file. You may find a template useful when
+ you have a certain piece of code you want to reuse several times, and you do
+ not want to write it out every time.</p>
+ <div class="skipspace">You can use the default template as
+provided, customize that template, or create your own templates. For example, you may work on a group of XML pages that should all
contain a table with a specific appearance. Create a template that contains
the tags for that table, including the appropriate attributes and attribute
values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's Pattern field.) Then select the name of the template
+editor into the template's <b>Pattern</b> field.) Then select the name of the template
from a content assist proposal list whenever you want to insert your custom
table into an XML file.<p>To create a new XML template follow these steps:</p>
</div>
-<ol><li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
-Templates</span></span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">New</span> if you want to create a completely
+<ol><li class="skipspace"><span>Click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
+Templates</span></span></b>.</span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">New</span></b> if you want to create a completely
new template.</span></li>
-<li class="skipspace"><span>Supply a new template name and description</span></li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Context</span> for the template.</span> This is the content in which the template is available in the proposal
+<li class="skipspace"><span>Supply a new template <b>Name</b> and <b>Description</b>.</span></li>
+<li class="skipspace"><span>Specify the <b> <span class="uicontrol">Context</span></b> for the template.</span> This is the context in which the template is available in the proposal
list when content assist is requested. </li>
-<li class="skipspace"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by contente
-assit.</span></li>
-<li class="skipspace"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted. </span> For example, the word_selection
+<li class="skipspace"><span>Specify the <b> <span class="uicontrol">Pattern</span></b> for your template using
+the appropriate tags, attributes, or attribute values to be inserted by content
+assist.</span></li>
+<li class="skipspace"><span>If you want to insert a variable in your <b>Pattern</b>, click the
+<b> <span class="uicontrol">Insert Variable</span></b> button
+and select the variable to be inserted. </span> For example, the<b> word_selection</b>
variable indicates the word that is selected at the beginning of template
-insertion, and the cursor variable determines where the cursor will be after
-the template is inserted in the HTML document</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
+insertion, and the <b>cursor</b> variable determines where the cursor will be after
+the template is inserted in the HTML document.</li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Apply</span></b> and then
+<b> <span class="uicontrol">OK</span></b> to
save your changes.</span></li>
</ol>
<div class="skipspace">You can edit, remove, import, or export a template by using the same
-Preferences page. If you have modified a default template, you can restore
+ preferences page. If you have modified a default template, you can restore
it to its default value. You can also restore a removed template if you have
not exited from the workbench since it was removed. <p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and templates
+that you do not want to remove, but you no longer want the template to appear
+in the content assist list, go to the <b>XML Templates </b>preferences page and
+ clear
its check box.</p>
</div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
</div>
-</body>
+</div></body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
index d8840ab..b7f8d12 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
@@ -19,6 +19,8 @@
<body id="twxvalid"><a name="twxvalid"><!-- --></a>
<h1 class="topictitle1">Validating XML files</h1>
+<div><p>When you validate your XML file, the XML validator will check to
+see that your file is valid and well-formed.</p>
<div><div class="skipspace"><p>The XML editor will process XML files that are invalid or not
well-formed. The editor uses heuristics to open a file using the best interpretation
of the tagging that it can. For example, an element with a missing end tag
@@ -30,25 +32,26 @@
validation on your documents.</p>
</div>
<div class="p"><span>You can validate your file by selecting it in the
-Navigator view, right-clicking it, and clicking <span class="uicontrol">Validate XML file</span>.</span></div>
-<div class="skipspace"><p>Any validation problems are indicated in the Problems view. For
-more details about a problem, right-click on the problem message and click <span class="uicontrol">Show
-Details</span>. </p>
+Navigator view, right-clicking it, and clicking <b> <span class="uicontrol">Validate XML file</span>.</b></span></div>
+<div class="skipspace"><p>Any validation problems are indicated in the Problems view. For
+more details about a problem, right-click on the problem message and click <b> <span class="uicontrol">Show
+Details</span></b>. </p>
</div>
<div class="skipspace"><p>In the Problems view, you can double-click on individual errors,
and you will be taken to the invalid tag in the file, so that you can make
corrections. </p>
<p><b>Note</b>: If you receive an error message indicating
that the Problems view is full, you can increase the number of error messages
-allowed by selecting <span class="menucascade"><span class="uicontrol">Properties</span> > <span class="uicontrol">Validation</span></span> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You must select the <span class="uicontrol">Override validation
-preferences</span> check box in order to be able to do this.</p>
+allowed by selecting <b> <span class="menucascade"><span class="uicontrol">Properties</span> > <span class="uicontrol">Validation</span></span></b> from the project's pop-up menu and specifying the maximum number
+of error messages allowed. You must select the <b> <span class="uicontrol">Override validation
+preferences</span> </b>check box in order to be able to do this.</p>
<p>As
well, you can set up a project's properties so that different types of project
resources are automatically validated when you save them. From a project's
-pop-up menu select <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
-Any validators you can run against your project will be listed in the
-Validation page. </p>
+pop-up menu select <b> <span class="uicontrol">Properties</span></b>, then select
+<b> <span class="uicontrol">Validation</span></b>.
+Any validators you can run against your project will be listed in the Validation
+page. </p>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
index 994020f..ee36707 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
@@ -23,7 +23,7 @@
simultaneously as a table and a tree. This helps make navigation and editing
easier. Content and attribute values can be edited directly in the table cells,
while pop-up menus on the tree elements give alternatives that are valid for
-that particular element.</p><div class="skipspace"><p> For example, the <span class="uicontrol">Add child</span> menu item will
+that particular element.</p><div class="skipspace"><p> For example, the <b> <span class="uicontrol">Add child</span></b> menu item will
list only those elements from a DTD or XML schema which would be valid children
at that point.</p>
<p>When you have an XML file associated with an XML schema
@@ -35,8 +35,8 @@
new elements and attributes.</p>
<p>For any XML file associated with an XML
schema or DTD file, you can use the Design view to add any items defined in
-the XML schema or DTD (such as elements and attributes) to the XML file. You
-can also use it to add processing instructions and comments to all XML files. </p>
+the XML schema or DTD (such as elements and attributes) to the XML file. You can
+also use it to add processing instructions and comments to all XML files.</p>
<p>For
more information on the icons used in the Design view, refer to the related
reference.</p>
@@ -46,46 +46,51 @@
edit an XML file in the Design view, follow these steps:</p>
</div>
<ol><li class="skipspace"><span>Open the XML file that you want to work with in the XML editor
-(right-click the file in the Navigator view and click <span class="uicontrol">Open With
-> XML Editor</span>). If necessary, click the <span class="uicontrol">Design</span> tab.</span></li>
-<li class="skipspace"><span>To expand all the items in your XML file, click the <span class="uicontrol">Expand
-All</span> toolbar button <img src="../images/expand_all.gif" />.</span></li>
-<li class="skipspace"><span>To collapse them, click the <span class="uicontrol">Collapse All</span> toolbar
+(right-click the file in the Navigator view and click <b> <span class="uicontrol">Open With
+> XML Editor</span></b>). If necessary, click the <span class="uicontrol">Design</span> tab.</span></li>
+<li class="skipspace"><span>To expand all the items in your XML file, click the
+<b> <span class="uicontrol">Expand
+All</span> </b>toolbar button <img src="../images/expand_all.gif" />.</span></li>
+<li class="skipspace"><span>To collapse them, click the <b> <span class="uicontrol">Collapse All</span></b> toolbar
button <img src="../images/collapse_all.gif" />.</span></li>
<li class="skipspace"><span>Right-click the item that you want to work with.</span> Some
or all of the following options (as applicable) will be available from the
pop-up menu that appears. For more information on these options, refer to
-the related tasks:<ul><li> <span class="uicontrol">Add DTD Information</span> - Click this if you want to
-associate the XML file with a DTD</li>
-<li> <span class="uicontrol">Edit DOCTYPE</span> - Click this if you want to edit
-the DOCTYPE declaration.</li>
-<li> <span class="uicontrol">Edit Namespaces</span> - Click this if you want to edit
+the related links below:<ul><li> <b> <span class="uicontrol">Add DTD Information</span>
+ </b>- Click this if you want to
+associate the XML file with a DTD.</li>
+<li> <b> <span class="uicontrol">Edit DOCTYPE</span></b> - Click this if you want to edit
+the DOCTYPE declaration. Refer to the related task for more details.</li>
+<li> <b> <span class="uicontrol">Edit Namespaces</span></b> - Click this if you want to edit
the existing namespace information or create a new association with a namespace.</li>
-<li> <span class="uicontrol">Edit Processing Instruction</span> - Click this if you
-want to edit the processing instruction.</li>
-<li> <span class="uicontrol">Remove</span> - Click this if you want to remove the
+Refer to the related task for more details.</li>
+<li> <b> <span class="uicontrol">Edit Processing Instruction</span></b> - Click this if you
+want to edit the processing instruction. Refer to the related task for more
+details.</li>
+<li> <b> <span class="uicontrol">Remove</span></b> - Click this if you want to remove the
item that you have selected from the XML file. This option will not be available
if the item you want to remove must exist (for example, in your DTD, you have
declared that "One or more" of the item must always exist in your XML file,
and the item you have selected is the only one that exists in your XML file).</li>
-<li> <span class="uicontrol">Add Attribute</span> - Click this if you want to add
-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. </li>
-<li> <span class="uicontrol">Add Child</span> - Click this to add another element,
+<li> <b> <span class="uicontrol">Add Attribute</span></b> - Click this if you
+want to add 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.</li>
+<li> <b> <span class="uicontrol">Add Child</span> </b>- Click this to add another element,
a comment, or a processing instruction as a child of the parent element.</li>
-<li> <span class="uicontrol">Add Before</span> - Click this to add a child element,
+<li> <b> <span class="uicontrol">Add Before</span></b> - Click this to add a child element,
comment, or processing instruction that can go before the item you have selected.
For example, if you have a parent element called "CD Collections" that can
contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add Before</span> > <span class="uicontrol"> CD</span></span> , as a CD element can go before another CD element.</li>
-<li> <span class="uicontrol">Add After</span> - Click this to add a child element,
+element and click <b> <span class="menucascade"><span class="uicontrol">Add Before</span> > <span class="uicontrol"> CD</span></span></b> , as a CD element can go before another CD element.</li>
+<li> <b> <span class="uicontrol">Add After</span> </b>- Click this to add a child element,
comment, or processing instruction that can go after the item you have selected.
For example, if you have a parent element called "CD Collections" that can
contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add After</span> > <span class="uicontrol"> CD</span></span>, as a CD element can go after another CD element.</li>
-<li> <span class="uicontrol">Replace With</span> - Click this if you want to replace
+element and click <b> <span class="menucascade"><span class="uicontrol">Add After</span> > <span class="uicontrol"> CD</span></span>,</b> as a CD element can go after another CD element.</li>
+<li> <b> <span class="uicontrol">Replace With</span></b> - Click this if you want to replace
one item with another. This option is not available if you turn grammar constraints
off or if there are no valid alternatives for you to replace the item with.</li>
</ul>
@@ -97,24 +102,20 @@
</div>
</div>
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tedtdoc.html">Editing your DOCTYPE declaration</a></b><br />
-The DOCTYPE declaration in an XML file is used at the beginning 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.</div>
-<div class="ulchildlink"><b><a href="../topics/tedtsch.html">Editing your namespace information</a></b><br />
-Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. </div>
-<div class="ulchildlink"><b><a href="../topics/tedtproc.html">Editing your XML processing instructions</a></b><br />
-A processing instruction is a syntax in XML for passing instructions along to the application using an XML document.</div>
-</blockquote>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files">XML editor</a><br />
-<a href="../topics/cxmlcat.html" title="There are two different ways to associate XML files with DTDs or XML schemas.">XML file associations with DTDs and XML schemas</a><br />
+<p><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
+<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered 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.">XML file associations with DTDs and XML schemas</a></div>
</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a><br />
+<p class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing DOCTYPE declarations</a></div>
+<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
+<div><a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
</p>
-</div>
+<p class="relref"><strong>Related reference</strong><br />
+<div><a href="../topics/rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div>
+</p>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
index 0e796cb..e2c1762 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
@@ -21,7 +21,7 @@
<h1 class="topictitle1">Editing in the Source view</h1>
<div><p>You can use the Source view to view and work with a file's source
code directly.</p><div class="skipspace"><p> The Source view has many text editing features, such as:</p>
-<dl><dt class="bold">Syntax highlighting</dt>
+<dl><dt class="bold"><b>Syntax highlighting</b></dt>
<dd>Each tag type is highlighted differently, enabling you to easily find
a certain kind of tag for editing. In addition, syntax highlighting is valuable
in locating syntax errors. For example, if you begin a comment in the middle
@@ -32,38 +32,39 @@
tasks for more information.</p>
</dd>
</dl>
-<dl><dt class="bold">Unlimited undo and redo</dt>
+<dl><dt class="bold"><b>Unlimited undo and redo</b></dt>
<dd>These options allow you to incrementally undo and redo every change made
to a file for the entire editing session. For text, changes are incremented
one character or set of selected characters at a time.</dd>
-<dt class="bold">Content assist</dt>
-<dd>Content assist helps you finish tags and insert macros. </dd>
-<dt class="bold">Template</dt>
+<dt class="bold"><b>Content assist</b></dt>
+<dd>Content assist helps you finish tags and insert macros. Refer to
+the related task for more details.</dd>
+<dt class="bold"><b>Template</b></dt>
<dd>You can access templates (using content assist) to help you quickly add
-regularly-used tagging combinations.</dd>
-<dt class="bold">Node selection</dt>
+regularly-used tagging combinations. Refer to the related task for more details.</dd>
+<dt class="bold"><b>Node selection</b></dt>
<dd>Based on the location of your cursor (or selection in the Outline view),
the node selection indicator highlights the line numbers that include a node
(for example, an element or attribute), in the vertical ruler in the left
area of the Source view.</dd>
-<dt class="bold">Pop-up menu options</dt>
+<dt class="bold"><b>Pop-up menu options</b></dt>
<dd>From the editor's pop-up menu, you have many of the same editing options
available as you do from the workbench <b>Edit</b> menu. You can select menu
-options such as: <span class="uicontrol">Cleanup Document,</span> to open the <span class="uicontrol">Cleanup</span>
+options such as: <span class="uicontrol"><b>Cleanup Document</b>,</span> to open the <span class="uicontrol">Cleanup</span>
dialog, which contains settings to update a document so that it is well-formed
-and formatted and <span class="uicontrol">Format,</span> which formats either the
+and formatted and <span class="uicontrol"><b>Format</b>,</span> which formats either the
entire document or selected elements.</dd>
-<dt class="bold">"Smart" double clicking</dt>
+<dt class="bold"><b>"Smart" double clicking</b></dt>
<dd>You can use double-click to select attribute values, attribute-value pairs,
and entire tag sets to quickly update, copy, or remove content.</dd>
</dl>
<p>To edit an XML file in the Source view, follow these steps:</p>
</div>
<ol><li class="skipspace"><span>Open the XML file you want to work with in the XML editor (right-click
-the file in the Navigator view and click <span class="uicontrol">Open With > XML Editor</span>). </span> You may need to click the <span class="uicontrol">Source</span> tab. Typically,
+the file in the Navigator view and click <b> <span class="uicontrol">Open With > XML Editor</span></b>). </span> You may need to click the <span class="uicontrol">Source</span> tab. Typically,
all that you will need to do to open the file is to double-click it in the
-Navigator view. If this does not work, right-click it and click <span class="uicontrol">Open
-With > XML Editor</span>.</li>
+Navigator view. If this does not work, right-click it and click <b> <span class="uicontrol">Open
+With > XML Editor</span></b>.</li>
<li class="skipspace"><span>Edit the code as necessary, using any of the available features.</span> As you move the cursor within your XML file (or select items from the
Outline view), the node selection indicator will highlight the line numbers
that encompass the node (for example, an element or attribute). You can use
@@ -87,7 +88,9 @@
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a><br />
-</p>
+<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
+<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
+<div><a href="../topics/ttaghilt.html" title="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in.">Setting source highlighting styles</a></div></p>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
index 97fd11c..31a37c1 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
@@ -19,26 +19,23 @@
<body id="txedttag"><a name="txedttag"><!-- --></a>
<h1 class="topictitle1">Editing XML files</h1>
+<div><p>This file contains information about editing XML files.</p>
<div><div class="skipspace"><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and click <span class="menucascade"><span class="uicontrol">Open With</span> > <span class="uicontrol">XML
-Editor</span></span>. To make the XML editor the default editor
-for XML files, select <span class="uicontrol">Window > Preferences > Workbench > File Associations</span>,
-then select <span class="uicontrol">*.xml</span> and <span class="uicontrol">XML Editor</span> from
-the Associated Editors list. Click <span class="uicontrol">OK</span>. </p>
+view and click <b> <span class="menucascade"><span class="uicontrol">Open With</span> > <span class="uicontrol">XML
+Editor</span></span></b>. </p>
<p>We
recommend working in the Resource perspective when you are developing XML
-files. The views that appear by default in this perspective (such as
+files. The views that appear by default in this perspective (such as
the Outline view) help facilitate XML development.</p>
<p>The XML editor enables
-you to directly edit XML files. There are several different views you
+you to directly edit XML files. There are several different views you
can use to edit your files:</p>
<ul><li><b>Source view</b> - you can manually insert, edit, and delete elements
and attributes in the Source view of the XML editor. To facilitate this effort,
you can use content assist while you are in the Source view.</li>
<li><b>Design view</b> - you can insert, delete, and edit elements, attributes,
comments, and processing instructions in this view.</li>
-<li><b>Properties view</b> - you can edit attribute values in this view.</li>
-<li><b>Outline view </b>- you can insert, delete, and edit elements,
+<li><b>Outline view </b>- you can insert, delete, and edit elements,
comments, and processing instructions in this view.</li>
</ul>
<p>Often, you may find that you have more than one way to perform a specific
@@ -47,14 +44,23 @@
in a school. You want to insert a new element "Math" into your file. You can
do so the following ways:</p>
<ul><li>In the Outline or Design view, right-click the appropriate parent element
-and select <span class="uicontrol">Math</span> from the <span class="uicontrol">Add Child</span> pop-up
-menu. </li>
+and select <span class="uicontrol">Math</span> from the <b> <span class="uicontrol">Add Child</span></b>
+ pop-up menu.</li>
<li>In the Source view, use content assist to help you find the appropriate
location and code for the <span class="uicontrol">Math</span> element.</li>
<li>In the Source view, type the code for the <span class="uicontrol">Math</span> element
in the file.</li>
</ul>
</div>
+<p class="section">The following links provide more information about the XML editor
+and editing XML files:</p>
</div>
-</body>
+<p><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
+</p>
+<p class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
+<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
+
+</p></body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
index 56690a9..16f5140 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
@@ -14,22 +14,22 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding an entry to the XML Catalog</title>
+<title>Adding entries to the XML Catalog</title>
</head>
<body id="txmlcat"><a name="txmlcat"><!-- --></a>
-<h1 class="topictitle1">Adding an entry to the XML Catalog</h1>
+<h1 class="topictitle1">Adding entries to the XML Catalog</h1>
<div><div class="skipspace"><p>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a URI (which contains information about a DTD or
-XML schema's location). You can place the Key in an XML file. When the
-XML processor encounters it, it will use the XML Catalog entry to find the
-location of the DTD or XML schema associated with the Key. </p>
-<p>XML
-Catalog entries can be used in various situations. For example, you are working
-on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
+a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains
+information about a DTD or XML schema's location). You can place the
+Key in an XML file. When the XML processor encounters it, it will use the
+XML Catalog entry to find the location of the DTD or XML schema associated
+with the Key</p>
+<div class="section"><p>XML Catalog entries can be used in various situations. For example,
+you are working on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
a schema called <samp class="codeph">c:\MySchema.xsd</samp>. You then save it to your
laptop computer so you can work on it later. When you open the file on your
-laptop, however, you encounter a problem - the XML editor cannot find the <samp class="codeph">MySchema.xsd</samp> schema because
+laptop, however, you encounter a problem - the XML editor cannot find the <samp class="codeph">MySchema.xsd</samp> schema because
it is actually installed on your D drive. You will have to edit the <samp class="codeph">schemaLocation</samp>to
point to <samp class="codeph">d:\MySchema.xsd</samp>. When you have finished editing
the XML file and are ready to publish it on the Web, you will need to edit
@@ -46,9 +46,6 @@
<samp class="codeph">"file:///C:/MySchema.xsd"</samp>). Now, instead of frequently editing
XML documents to update the URIs (especially when there may be many documents
in your project), you only need to update a single rule in your XML Catalog.</p>
-<p>More
-information on XML Catalog entries is included in the sample <a href="aexpledt.html">Exploring
-the XML editor</a>.</p>
<p>The following instructions were written for the
XML perspective, but they will also work in many other perspectives.</p>
<p>To
@@ -56,53 +53,64 @@
</div>
<ol><li class="skipspace"><span>Open the XML file that you want to associate with a DTD or XML
schema.</span></li>
-<li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Catalog</span></span>.</span></li>
-<li class="skipspace"><span>The <span class="uicontrol">XML Catalog Entries</span> field contains
-a list of any user-defined and plug-in defined catalog entries.</span><ol type="a"><li><span>Select any entry to see details about it in the <span class="uicontrol">Details</span> field. </span></li>
-<li><span>Click <span class="uicontrol">New</span> to create a new catalog entry.</span></li>
+<li class="skipspace"><span>Click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Catalog</span></span></b>.</span></li>
+<li class="skipspace"><span>The <b> <span class="uicontrol">XML Catalog Entries</span></b> field contains
+a list of any user-defined and plug-in defined catalog entries.</span><ol type="a"><li><span>Select any entry to see details about it in the
+ <b> <span class="uicontrol">Details</span></b> field. </span></li>
+<li><span>Click <span class="uicontrol"><b>Add</b></span> to create a new catalog entry.</span></li>
</ol>
</li>
-<li class="skipspace"><span>In the <span class="uicontrol">URI</span> field, type the location of the
-DTD or XML schema. You can only browse for the DTD or XML schema if it
-is located in the workbench.</span></li>
-<li class="skipspace"><span>If you specified a DTD in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span> from the <span class="uicontrol">Key Type</span> field.</span> If
-you select<span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
-should be the same as the Public ID in the XML file's DOCTYPE declaration.
-If you select <span class="uicontrol">System ID</span>, the value you enter should
+<li class="skipspace"><span>In the <b> <span class="uicontrol">URI</span></b> field, type the location of the DTD or XML schema
+or browse for it. </span></li>
+<li class="skipspace"><span>If you specified a DTD in the <b> <span class="uicontrol">URI</span></b> field,
+you can select either <span class="uicontrol"><b>Public ID</b></span> or <b>
+<span class="uicontrol">System
+ID</span> </b>from the <b> <span class="uicontrol">Key Type</span></b> field.</span> If
+you select<b><span class="uicontrol"> Public ID,</span></b> the value you enter in the
+<b> <span class="uicontrol">Key</span></b> field
+should be the same as the <b>Public ID i</b>n the XML file's DOCTYPE declaration.
+If you select <b> <span class="uicontrol">System ID</span>,</b> the value you enter should
correspond to the System ID in an XML file's DOCTYPE declaration.</li>
-<li class="skipspace"><span>If you specified an XML schema in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Namespace Name</span> or <span class="uicontrol">Schema
-Location</span> from the <span class="uicontrol">Key Type</span> field.</span> If the schema defines a target namespace, it will automatically appear
-in the<span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
-location in the <span class="uicontrol">Key</span> field.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Specify alternative Web address</span> check
-box if you want to be able to specify an alternate Web address for the resource.</span> This Web address is used when an XML instance is generated from this
-catalog entry. <b>Note</b>: This option is only available if you select <span class="uicontrol">Public
-ID</span> (for a DTD) or <span class="uicontrol">Namespace Name</span> (for
-a schema) in the <span class="uicontrol">Key type</span> field.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Advanced</span> if you want to import or
+<li class="skipspace"><span>If you specified an XML schema in the <b> <span class="uicontrol">URI</span></b> field,
+you can select either <b> <span class="uicontrol">Namespace Name</span> </b>or
+<b> <span class="uicontrol">Schema
+Location</span> </b>from the <b> <span class="uicontrol">Key Type</span></b> field.</span> If the schema defines a target namespace, it will automatically appear
+in the<span class="uicontrol"> <b>Key</b></span> field. Otherwise, you can enter the schema
+location in the <b> <span class="uicontrol">Key</span></b> field.</li>
+<li class="skipspace"><span>Select the <b> <span class="uicontrol">Specify alternative Web address</span>
+</b>check
+box if you want to be able to specify an alternate Web address for the resource.</span>
+This Web address is used when an XML instance is generated from this catalog
+entry. <b>Note</b>: This option is only available if you select <b> <span class="uicontrol">Public
+ID</span> </b>(for a DTD) or <b> <span class="uicontrol">Namespace Name</span>
+</b>(for
+a schema) in the <b> <span class="uicontrol">Key type</span> </b>field.</li>
+ <li class="skipspace">If you want to refer to another catalog without
+ importing it into the workbench, click <b>Next Catalog. </b>Type or browse
+ for the XML catalog you want to refer to. </li>
+<li class="skipspace"><span>When you are done creating catalog entries, click <span class="uicontrol">
+<b>OK</b></span> to close the Add XML Catalog Entry dialog. </span></li>
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Advanced</span></b> if you want to import or
export any XML Catalog settings.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Export</span> if you want to persist the
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Export</span></b> if you want to persist the
XML Catalog information. Only your user specified entries will be exported.</span><ol type="a"><li class="skipspace"><span>You will be prompted to select a project and provide a file
name to store your catalog entries in an .xmlcatalog file, which can be opened
-from the Navigator view.</span> Snce your catalog entries are stored in
+from the Navigator view.</span> Since your catalog entries are stored in
an .xmlcatalog file, you can check them in and out and share them like any
other project resource.</li>
-<li class="skipspace"><span> Click<span class="uicontrol">OK</span>.</span></li>
+<li class="skipspace"><span> Click<span class="uicontrol"> <b>OK</b></span>.</span></li>
</ol>
</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Import</span> if you want to import an .xmlcatalog
-file. You will be prompted to select the file you want to import.</span><ol type="a"><li><span>When you import a .xmlcatalog file, any entries in it will be
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Import</span></b> if you want to import an .xmlcatalog
+file. You will be prompted to select the file you want to import.</span><ol type="a"><li><span>When you import a .xmlcatalog file, any entries in it will be
loaded into the XML Catalog (and any existing entries will be overwritten). </span></li>
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
+<li><span>Click <b> <span class="uicontrol">OK</span></b>.</span></li>
</ol>
</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to close the Advanced XML Catalog
+<li class="skipspace"><span>Click <b> <span class="uicontrol">OK</span></b> to close the Advanced XML Catalog
Preferences dialog.</span></li>
-<li class="skipspace"><span>Make sure the XML file is in focus and click the<span class="uicontrol">Reload
+<li class="skipspace"><span>Make sure the XML file is in focus and click the<span class="uicontrol">
+<b>Reload</b>
dependencies</span> toolbar button. </span></li>
</ol>
<div class="skipspace">The XML file is now associated with the latest version of the XML
@@ -117,7 +125,7 @@
<a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a><br />
<a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning 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.">Editing your DOCTYPE declaration</a><br />
<a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes.">Updating XML files with changes made to DTDs and schemas</a><br />
-<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with. ">Editing your namespace information</a><br />
+<a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema it is associated with.?">Editing your namespace information</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
index e524fe3..5de5964 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
@@ -26,26 +26,30 @@
<p>To define XML preferences,
perform the following steps:</p>
</div>
-<ol><li class="skipspace"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
-Source</span></span>.</span></li>
-<li class="skipspace"><span>Enter a maximum width for formatted lines in the <span class="uicontrol">Line
-width</span> field</span> The default value is 72. </li>
-<li class="skipspace"><span>Select <span class="uicontrol">Split multiple attributes each on a new line</span> to
+<ol><li class="skipspace"><span>Click <b> <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
+Source</span></span></b>.</span></li>
+<li class="skipspace"><span>Enter a maximum width for formatted lines in the <b> <span class="uicontrol">Line
+width</span> </b>field.</span> The default value is <b>72</b>.</li>
+<li class="skipspace"><span>Select <span class="uicontrol"><b>Split multiple attributes each on a new line</b></span> to
start every attribute on a new line.</span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Indent using tabs</span> check box is selected
+ <li class="skipspace"><span>If you want blank lines to be removed when the document is formatted,
+select the <b> <span class="uicontrol">Clear all blank lines</span> </b>check box. </span> By default, blank lines are preserved in a formatted document.</li>
+<li class="skipspace"><span>The<b> <span class="uicontrol">Indent using tabs</span>
+</b>check box is selected
by default.</span> If you clear it, spaces are used instead of tab characters.</li>
-<li class="skipspace"><span>If you want blank lines to be removed when the document is formatted,
-select the <span class="uicontrol">Clear all blank lines</span> check box. </span> By default, blank lines are preserved in a formatted document.</li>
<li class="skipspace"><span>You can specify certain characters ('<' is default) that will
-cause the content assist list to pop up automatically. Ensure the <span class="uicontrol">Automatically
-make suggestions</span> check box is selected and specify the characters
-in the <span class="uicontrol">Prompt when these characters are inserted</span> field. </span></li>
-<li class="skipspace"><span>The <span class="uicontrol">Use inferred grammar in absence of DTD/Schema </span>check
+cause the content assist list to pop up automatically. Ensure the<b> <span class="uicontrol">Automatically
+make suggestions</span></b> check box is selected and specify the characters
+in the <b> <span class="uicontrol">Prompt when these characters are inserted</span>
+</b>field. </span></li>
+<li class="skipspace"><span>The<b> <span class="uicontrol">Use inferred grammar in absence of DTD/Schema </span>
+</b>check
box is selected by default. </span> If this box is selected, when you
have an XML file that is not associated with a DTD or XML schema, you will
still be able to get content assist - the tool will infer what should come
next in your file based on the existing content.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
+<li class="skipspace"><span>Click <b> <span class="uicontrol">Apply</span></b> and then
+<b> <span class="uicontrol">OK</span></b> to
save your changes.</span></li>
</ol>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
index 2e32805..4551071 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
@@ -24,10 +24,12 @@
and any other complex types derived from it.</p><div class="skipspace"><p>The XML Schema specification allows you to derive types by extension.
For example, you have an XML schema and you create a complex type for it called
<kbd class="userinput">Address</kbd>. You then add some basic elements to <kbd class="userinput">Address</kbd>,
-such as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>. </p>
+such as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>.</p>
<p>After
-this, you derive (by extension) two new complex types from <kbd class="userinput">Address</kbd> - <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd> You add a new element to <kbd class="userinput">USAddress</kbd> called
- <kbd class="userinput">state</kbd>, and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</p>
+this, you derive (by extension) two new complex types from <kbd class="userinput">Address</kbd>
+- <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd> You add a new element to <kbd class="userinput">USAddress</kbd> called
+ <kbd class="userinput">state</kbd>, and also a new element to
+<kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</p>
<p>After
you have done this, you create two more elements - <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd> -
as <tt class="sysout">Address</tt> types <tt class="sysout">.</tt></p>
@@ -50,11 +52,11 @@
"Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p>
<p>For
more information about xsi:type, refer to the <b>Using Derived Types in Instance
-Documents</b> section in <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
+Documents</b> section in <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
<p>For
more information about validation semantics when xsi:type is used, refer to
the <b>Schema-Related Markup in Documents Being Validated</b> section
-in <a href="http://www.w3.org/TR/xmlschema-1/#xsi_type" target="_blank">XML Schema Part 1: Structures</a> </p>
+in <a href="http://www.w3.org/TR/xmlschema-1/#xsi_type" target="_blank">XML Schema Part 1: Structures</a> </p>
</div>
</div>
<div>