new data plugin
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
index af5d27b..9e6b544 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
@@ -11,33 +11,13 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
-<toc label="DTD Editor" topic="topics/tcretdtd.html">
- <topic label="Working with DTDs">
+<toc label="DTD Editor">
+ <topic label="Working with DTDs" topic="topics/cworkdtds.html">
<topic label="Creating DTDs" href="topics/tcretdtd.html">
<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
</topic>
<topic label="Importing DTDs" href="topics/timptdtd.html"/>
- <topic label="Editing DTDs" href="topics/tedtdtd.html">
- <topic label="DTD editor" href="topics/cdtdedit.html"/>
- <topic label="Creating elements" href="topics/tcretelm.html">
- <topic label="Creating attributes and attribute lists" href="topics/tcretattr.html"/>
- <topic label="Editing an element's content model" href="topics/tchgelm.html">
- <topic label="Editing a group node" href="topics/tedtgnde.html"/>
- </topic>
- </topic>
- <topic label="Creating entities" href="topics/tcretent.html">
- <topic label="Reusing internal parameter entities in an attribute name or type" href="topics/trusintp.html"/>
- <topic label="Reusing the value of one entity in another entity" href="topics/trusents.html"/>
- <topic label="Reusing external parameter entities in an element's content model" href="topics/trusextp.html"/>
- </topic>
- <topic label="Creating notations" href="topics/tcretnot.html"/>
- <topic label="Creating a comment" href="topics/tcretcomm.html"/>
- <topic label="Deleting elements, attributes, entities, notations, and comments" href="topics/tremvelm.html">
- <topic label="Referential integrity in the DTD editor" href="topics/rrefint.html"/>
- </topic>
- </topic>
- <topic label="Validating DTDs" href="topics/tvaldtd.html"/>
- <topic label="Generating XML schemas from DTD files" href="topics/tgenxmls.html"/>
+ <topic label="Validating DTDs" href="topics/tvaldtd.html"/>
<topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
</topic>
</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
deleted file mode 100644
index e09310a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<toc label="DTD editor reference files" topic="topics/rrefint.html">
- <topic label="Referential integrity in the DTD editor" href="topics/rrefint.html"/>
- <topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
index 4f44e65..cd121e2 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
@@ -13,12 +13,7 @@
<plugin>
<extension point="org.eclipse.help.toc">
-
<toc file="DTDEditormap_toc.xml"/>
-
- <toc file="dtdeditor_reference_toc.xml"/>
-
-
</extension>
</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html
deleted file mode 100644
index 98ba40c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdedit.html
+++ /dev/null
@@ -1,46 +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>DTD editor</title>
-</head>
-<body id="cdtdedit"><a name="cdtdedit"><!-- --></a>
-
-<h1 class="topictitle1">DTD editor</h1>
-<div><p>After you have created or imported a DTD, you can open it in the
-DTD editor (by double-clicking it in the Navigator view), a tool for viewing
-and editing DTDs. You can use the DTD editor to perform a variety of tasks
-such as creating, editing, and deleting DTD elements, attributes, entities,
-notations, and comments</p><p>Before you can perform any of these tasks, you must create a DTD and open
-it in the DTD editor. After you open the DTD, you can use the <span class="uicontrol">Outline</span> view
-to create nodes and the <span class="uicontrol">Properties</span> view to provide
-details about the nodes.</p>
-<p></p>
-<p> <b>Note</b>: In the <span class="uicontrol">Outline</span> view, you can either
-work in default mode (all nodes appear in the order you added them to the
-DTD in) or group the DTD nodes into the following logical groups: notations,
-entities, elements, and other, by clicking the <span class="uicontrol">Group items logically</span> button <img src="../images/organize_dtd_logically.gif" />. </p>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
new file mode 100644
index 0000000..e5d7d29
--- /dev/null
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
@@ -0,0 +1,48 @@
+<?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>Working with DTDs</title>
+</head>
+<body id="workingwithdtds"><a name="workingwithdtds"><!-- --></a>
+<h1 class="topictitle1">Working with DTDs</h1>
+<div><p>This sections contains information on the following:</p>
+</div>
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/tcretdtd.html">Creating DTDs</a></strong><br />
+A document type definition (DTD) contains a set of rules that can
+be used to validate an XML file. After you have created a DTD, you can manually
+edit it, adding declarations that define elements, attributes, entities, and
+notations, and how they can be used for any XML files that reference the DTD
+file.</li>
+<li class="ulchildlink"><strong><a href="../topics/timptdtd.html">Importing DTDs</a></strong><br />
+If you want to work with DTD files that you created outside of
+the product, you can import them into the workbench and open them in the DTD
+editor. </li>
+<li class="ulchildlink"><strong><a href="../topics/tvaldtd.html">Validating DTDs</a></strong><br />
+Validating a DTD file lets you verify that it is well formed and
+does not contain any errors.</li>
+<li class="ulchildlink"><strong><a href="../topics/rdtdicons.html">Icons used in the DTD editor</a></strong><br />
+These DTD editor icons appear in the Outline view.</li>
+</ul>
+</div></body>
+</html>
+ <p>
+ (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
+ </p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
index 8a3ec7f..85065de 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
@@ -64,6 +64,12 @@
</table>
</div>
<div class="skipspace"></div>
+
+<div>
+<p>
+<b class="parentlink">Parent topic:</b> <a href="../topics/cworkdtds.html" title="Working with DTDs">Working with DTDs</a><br />
+</p>
+
</div>
<p>
(C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html
deleted file mode 100644
index fe71136..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rrefint.html
+++ /dev/null
@@ -1,67 +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">
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Referential integrity in the DTD editor</title>
-</head>
-<body id="rrefint"><a name="rrefint"><!-- --></a>
-
-<h1 class="topictitle1">Referential integrity in the DTD editor</h1>
-<div><p>The DTD editor has a built-in mechanism to handle referential integrity
-issues. When you delete or rename certain nodes, clean up for any nodes affected
-will automatically occur.</p><div class="skipspace">The following table describes the clean up that occurs when you delete
-or rename certain nodes.</div>
-
-<div class="skipspace"><table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all"><thead align="left"><tr><th valign="top" id="d0e21"> Action taken</th>
-<th valign="top" id="d0e23"> Clean up </th>
-</tr>
-</thead>
-<tbody><tr><td valign="top" headers="d0e21 ">An element is renamed.</td>
-<td valign="top" headers="d0e23 ">All references to that element will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An external parameter entity is renamed.</td>
-<td valign="top" headers="d0e23 ">Any external parameter entity references to it will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">A notation is renamed.</td>
-<td valign="top" headers="d0e23 ">All references to the notation will be renamed.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An element is deleted.</td>
-<td valign="top" headers="d0e23 ">All references to that element will be cleaned up or reset. The original
-element will be removed from the DTD file, and any references to it will be
-reset to the next available element. If there are no elements available, references
-to it will be reset to (#PCDATA).</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">An external parameter entity is deleted.</td>
-<td valign="top" headers="d0e23 ">Any external parameter entity references to it will automatically be
-deleted.</td>
-</tr>
-<tr><td valign="top" headers="d0e21 ">A notation is deleted.</td>
-<td valign="top" headers="d0e23 ">All references to the notation will be removed.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
- <p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html
deleted file mode 100644
index 9f9d6fa..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tchgelm.html
+++ /dev/null
@@ -1,90 +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">
-<!-- /*******************************************************************************
- * 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
- *******************************************************************************/ -->
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="../org.eclipse.wst.doc.user/common.css" />
-<title>Editing an element's content model</title>
-</head>
-<body id="tchgelm"><a name="tchgelm"><!-- --></a>
-
-<h1 class="topictitle1">Editing an element's content model</h1>
-<div><p>An element's content model represents any data that can be contained
-inside or within the content of an element (that is, between the start and
-end tags of an element in an XML file). Editing an element's content model
-enables you to determine exactly what the element can (and cannot) contain.</p><div class="skipspace"><p>There are four kinds of content models: <i>element content</i>,
- <i>mixed content</i>, <i>EMPTY content</i> and <i>ANY content</i></p>
-<p>In
-the <i>element content</i> content model an element can only contain other
-child elements. In the <i>mixed content</i> content model, an element can
-contain both character data (text that is not parsed by the XML parser) and
-other child elements. In the <i>EMPTY content</i> content model, an element
-cannot contain any other elements or text. In the <i>ANY content</i> content
-model, the element can literally contain anything - other elements, in any
-number, and text.</p>
-<p>In the DTD editor, you can create elements with any
-of these content models. When you create an element in the DTD editor, a child
-element with an EMPTY content model is automatically created.</p>
-<p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives. </p>
-<p>To edit an element's content
-model, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, expand the parent element you want to work
-with.</span></li>
-<li class="skipspace"><span>Select the first child of the expanded parent element.</span> This
-is the element's content model.</li>
-<li class="skipspace"><span>In the Design view, you change its <span class="uicontrol">Content type</span> to</span><ul><li><span class="uicontrol">ANY</span></li>
-<li>(#PCDATA)</li>
-<li>Another element</li>
-<li><span class="uicontrol">Children Content</span> or <span class="uicontrol">Mixed Content</span>.</li>
-</ul>
- Once you select either <span class="uicontrol">Children Content</span> or <span class="uicontrol">Mixed
-Content</span> you will have a group (represented by a group node - <img src="../images/XSDSequence.gif" /> if you select <span class="uicontrol">Children Content</span> and <img src="../images/XSDChoice.gif" /> if you select <span class="uicontrol">Mixed Content</span>),
-which you can use to create a group of child elements under the parent element.
-A child element will automatically be created under the group node. For information
-on editing a group, refer to the related information.<p><b>Note</b>: If you
-intend to have mixed content, the value of the first element in your group
-must be (#PCDATA) (consequently, if you select <span class="uicontrol">Mixed Content</span>,
-two child elements will automatically be created, the first one having a value
-of (#PCDATA).</p>
- </li>
-<li class="skipspace"><span>If you do not want the parent element to contain anything, leave
-its <span class="uicontrol">Content type</span> as <span class="uicontrol">EMPTY</span>.</span></li>
-<li class="skipspace"><span>Select the appropriate <b>Occurrence</b> option to indicate how
-often the element can occur in an XML file.</span> This option is not
-available if you select ANY, (#PCDATA), EMPTY, or another element.</li>
-<li class="skipspace"><span>To add another existing element to a group as a child, right-click
-the group node, click <span class="uicontrol">Add Element to Content Model</span> and
-specify its name.</span></li>
-<li class="skipspace"><span>To add a group to the content model, right-click the group node
-and click <span class="uicontrol">Add Group to Content Model</span>.</span> For
-information on editing a group, refer to the link below.</li>
-</ol>
-<div class="skipspace"></div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tedtgnde.html">Editing a group node</a></b><br />
-If your element has either element content or mixed content, its content model is represented by a group node. You can add children elements or another group to a group node, and specify how often, and in what manner a group of elements will be available in an XML file associated with your DTD.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretelm.html" title="You can use element declarations in DTDs to define the elements that may occur in an XML document. Element declarations can specify that an element can contain other elements, that it can contain anything at all, or that it must be empty.">Creating elements</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html
deleted file mode 100644
index ea409e5..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretattr.html
+++ /dev/null
@@ -1,52 +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>Creating attributes and attribute lists</title>
-</head>
-<body id="creatingattributes"><a name="creatingattributes"><!-- --></a>
-
-<h1 class="topictitle1">Creating attributes and attribute lists</h1>
-<div><p>You can use an attribute to describe an element or provide information
-about it. Attribute lists enable you to group together all related attributes
-for an element. </p><div class="skipspace"><p>All elements must have their attributes listed in an attribute
-list <img src="../images/attribute_list.gif" />. If you add an attribute <img src="../images/attribute.gif" /> to an element that does not
-already have an attribute list, an attribute list will be created for the
-element with a new attribute inserted in it.</p>
-<p>To create an attribute,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the element you want to work with
-and click <span class="uicontrol">Add Attribute</span>.</span> An attribute list
-will be created for your element if one does not already exist. </li>
-<li class="skipspace"><span>Select the attribute you just created. </span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the attribute in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>From the <span class="uicontrol">Type</span> list, select the attribute's
-type. </span></li>
-<li class="skipspace"><span>From <span class="uicontrol">Usage</span> list, select the default usage
-of the attribute.</span> It determines how the attribute can be used.</li>
-<li class="skipspace"><span>If you selected <span class="uicontrol">#FIXED</span> or <span class="uicontrol">Default</span> as
-the default usage of the attribute, you must enter a value in the <span class="uicontrol">Default
-value</span> field.</span></li>
-</ol>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html
deleted file mode 100644
index 5e70def..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretcomm.html
+++ /dev/null
@@ -1,40 +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>Creating a comment</title>
-</head>
-<body id="creatingacomment"><a name="creatingacomment"><!-- --></a>
-
-<h1 class="topictitle1">Creating a comment</h1>
-<div><p>Comments can be used to provide information about a document, such
-as the author's name, or the date it was last modified. Comments are visible
-to anyone reading the DTD, but are ignored by the XML parser.</p><div class="skipspace">To create a comment, follow these steps:</div>
-<ol><li><span>Open your DTD in the DTD editor.</span></li>
-<li><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and select <span class="uicontrol">Add Comment</span>.</span></li>
-<li><span>In the Properties view, type your comment.</span></li>
-</ol>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
index 1ae1924..6977963 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
@@ -21,7 +21,7 @@
<h1 class="topictitle1">Creating DTDs</h1>
<div><p>A document type definition (DTD) contains a set of rules that can
be used to validate an XML file. After you have created a DTD, you can edit
-it, adding declarations that define elements, attributes, entities, and notations,
+it manually, adding declarations that define elements, attributes, entities, and notations,
and how they can be used for any XML files that reference the DTD file.</p><div class="skipspace"><p></p>
<p>The following instructions were written for the Resource
perspective, but they will also work in many other perspectives. </p>
@@ -29,31 +29,33 @@
these steps to create a new DTD:</p>
</div>
<ol><li class="skipspace"><span>If necessary, create a project to contain the DTD.</span></li>
-<li class="skipspace"><span>In the workbench, select <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"> DTD</span></span> and click <span class="uicontrol">Next</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>If you are prompted to enable XML Development capabilities, click <span class="uicontrol">OK</span>.</span></li>
+<li class="skipspace"><span>In the workbench, select <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"> DTD File</b></span></span> and click <b><span class="uicontrol">Next</span></b>. </span>
<li class="skipspace"><span>Select the project or folder that will contain the DTD.</span></li>
<li class="skipspace"><span>In the <span class="uicontrol">File name</span> field, type the name of
the DTD, for example <kbd class="userinput">MyDTD.dtd</kbd>.</span> The
name of your DTD file must end with the extension <kbd class="userinput">.dtd</kbd></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
+<li class="skipspace"><span>Click <span class="uicontrol"><b>Finish</b></span>.</span></li>
</ol>
-<div class="skipspace"><p>The DTD appears in the Navigator view and automatically, by default,
-opens in the DTD editor. In the DTD editor, you can add elements, attributes,
+<div class="skipspace"><p>The DTD appears in the Navigator view and automatically
+opens in the DTD editor. In the DTD editor, you can manually add elements, attributes,
notations, entities, and comments to the DTD. If you close the file, and want
to later re-open it in the DTD editor, double-click it in the
Navigator view.</p>
</div>
</div>
+<div>
+<p>
+<b class="parentlink">Parent topic:</b> <a href="../topics/cworkdtds.html" title="Working with DTDs">Working with DTDs</a><br />
+</p>
+
+</div>
+
<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cdtdedit.html" title="After you have created or imported a DTD, you can open it in the DTD editor (by double-clicking it in the Navigator view), a tool for viewing and editing DTDs. You can use the DTD editor to perform a variety of tasks such as creating, editing, and deleting DTD elements, attributes, entities, notations, and comments">DTD editor</a><br />
<a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a><br />
</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-<a href="../topics/tgenxmls.html" title="Generating an XML schema from a DTD file enables you to create an XML schema that is automatically populated with elements and attributes from your DTD file. This can save you time if you want to use an XML schema rather than a DTD file to validate your XML file, but you want to use the rules already set up in your DTD file.">Generating XML schemas from DTD files</a><br />
-</p>
+
+
</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.html
deleted file mode 100644
index fdbcdea..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretelm.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>Creating elements</title>
-</head>
-<body id="tcretelm"><a name="tcretelm"><!-- --></a>
-
-<h1 class="topictitle1">Creating elements</h1>
-<div><p>You can use element declarations in DTDs to define the elements
-that may occur in an XML document. Element declarations can specify that an
-element can contain other elements, that it can contain anything at all, or
-that it must be empty.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p><b>Creating
-elements</b></p>
-<p>To create an element, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and click <span class="uicontrol">Add Element</span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the new name of the element in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>When you create an element in the DTD editor, a child element that
-is EMPTY is automatically created.</span><ol type="a"><li class="skipspace"><span>Select the EMPTY child element and, in the Properties view,
-change its <span class="uicontrol">Content type</span> to ANY, (#PCDATA), or another
-element.</span> If you do not want the parent element to contain anything,
-leave its content model type as EMPTY. </li>
-<li class="skipspace"><span>If you want your parent element to contain more than one child
-element (or mixed content), select <span class="uicontrol">Children Content</span> or <span class="uicontrol">Mixed
-Content</span> from the <span class="uicontrol">Content type</span> list.</span> Once you select either of these, you will have a group (represented
-by a group node - <img src="../images/XSDSequence.gif" /> if you select
-Children Content and <img src="../images/XSDChoice.gif" /> if you select
-Mixed Content), which you can use to create a group of child elements under
-the parent element. A child element will automatically be created under
-the group node. For information on editing a group, refer to the related information.
- </li>
-</ol>
-</li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab
-if you want to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the element.</li>
-</ol>
-<div class="skipspace"><p><b>Note</b>: If you intend to have mixed content, the value of
-the first element in your group must be (#PCDATA) (consequently, if you select <span class="uicontrol">Mixed
-Content</span>, two child elements will automatically be created, the
-first one having a value of (#PCDATA)). As well, a group should not contain
-an EMPTY or ANY element. EMPTY or ANY elements are not legally allowed as
-nested entities.</p>
-</div>
-</div>
-
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretattr.html" title="You can use an attribute to describe an element or provide information about it. Attribute lists enable you to group together all related attributes for an element.">Creating attributes and attribute lists</a><br />
-<a href="../topics/tchgelm.html" title="An element's content model represents any data that can be contained inside or within the content of an element (that is, between the start and end tags of an element in an XML file). Editing an element's content model enables you to determine exactly what the element can (and cannot) contain.">Editing an element's content model</a><br />
-<a href="../topics/tedtgnde.html" title="If your element has either element content or mixed content, its content model is represented by a group node. You can add children elements or another group to a group node, and specify how often, and in what manner a group of elements will be available in an XML file associated with your DTD.">Editing a group node</a><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html
deleted file mode 100644
index a499df7..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretent.html
+++ /dev/null
@@ -1,84 +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>Creating entities</title>
-</head>
-<body id="tcretent"><a name="tcretent"><!-- --></a>
-
-<h1 class="topictitle1">Creating entities</h1>
-<div><p>An entity is a shortcut used to represent complex strings or symbols
-that would otherwise be impossible, difficult or repetitive to include by
-hand. </p><div class="skipspace"><p>For example, you need to place a copyright notification (for example, <var class="varname">Copyright
-2005. MyCompany publishing</var>.) at the end of every page of a book.
-Instead of writing it every time, you could create an entity that represents
-this text: <samp class="codeph"><!ENTITY copyright "Copyright 2005. MyCompany publishing."></samp> where <samp class="codeph">copyright</samp> is
-the name of the entity and <samp class="codeph">"Copyright 2004. MyCompany publishing"</samp> is
-the text that the <samp class="codeph">copyright</samp> entity represents.</p>
-<p>To create
-an entity, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and click <span class="uicontrol">Add Entity </span>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the new name of the entity in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>From the <span class="uicontrol">Entity Type</span> list, select <span class="uicontrol">General</span> or <span class="uicontrol">Parameter</span>. </span> General entities are used in XML files, whereas parameter entities are
-used only in the DTD and do not have any use in an XML file.</li>
-<li class="skipspace"><span>Select the <span class="uicontrol">External</span> check box if you
-want to declare your entity as an external entity. An external entity references
-an external document or data.</span></li>
-<li class="skipspace"><span>If you did make the entity external, the following fields appear:</span><ul><li><span class="uicontrol">Public ID</span> (Optional). Type the path of the
-DTD you want to reference. You can then use the resources in the file you
-are referencing.</li>
-<li><span class="uicontrol">System ID</span>. Type the path of the external data
-or document you want to reference, or browse for it. You can then use the
-resources in the file you are referencing.</li>
-</ul>
- <p>You only need to specify the <span class="uicontrol">Public ID</span> or
-the <span class="uicontrol">System ID</span>, not both. If, in your DTD, you want
-to use any of the resources (such as elements or attributes) contained in
-the document you have referenced, you must make this entity a <span class="uicontrol">Parameter</span> entity,
-and "expand" the entity by creating an external parameter entity reference
-(right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" />,
-click <span class="uicontrol">Add Parameter Entity Reference</span>, and select the
-entity you just created). </p>
-</li>
-<li class="skipspace"><span>If you did not make the entity external, you can specify the entity
-value in the <span class="uicontrol">Entity value</span> field. </span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this entity.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the entity.</li>
-</ol>
-<div class="skipspace">The follow links explain different ways you can reuse entities:</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/trusintp.html">Reusing internal parameter entities in an attribute name or type</a></b><br />
-Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity). </div>
-<div class="ulchildlink"><b><a href="../topics/trusents.html">Reusing the value of one entity in another entity</a></b><br />
-Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.</div>
-<div class="ulchildlink"><b><a href="../topics/trusextp.html">Reusing external parameter entities in an element's content model</a></b><br />
-Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html
deleted file mode 100644
index 7e567fe..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretnot.html
+++ /dev/null
@@ -1,56 +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>Creating notations </title>
-</head>
-<body id="creatingnotations"><a name="creatingnotations"><!-- --></a>
-
-<h1 class="topictitle1">Creating notations </h1>
-<div><p>Notations are means of associating a binary description with an
-entity or attribute. The most common uses of notations are to include familiar
-types of binary references, such as GIFs and JPGs, in an XML file.</p><div class="skipspace"><p>For example, you are making a catalogue of your clothing and want
-to include an image of one of your shirts. You would have to create a notation
-similar to this one: <samp class="codeph"><!NOTATION myshirt SYSTEM "GIF"></samp> which
-defines a notation for a GIF image.</p>
-<p>To create a notation, follow these
-steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD icon" /> and select <span class="uicontrol">Add Notation </span>. </span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the notation in the <span class="uicontrol">Name</span> field.</span></li>
-<li class="skipspace"><span>(Optional) In the <span class="uicontrol">Public ID</span> field, type
-any information you want to supply to the user or application. For example,
-a description of what the notation refers to.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">System ID</span> field, type any information
-to be passed along to the application dealing with the binary data. For example,
-a URL.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this notation.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description of the notation
-contents.</li>
-</ol>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tremvelm.html" title="If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.">Deleting elements, attributes, entities, notations, and comments</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html
deleted file mode 100644
index 1594834..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtdtd.html
+++ /dev/null
@@ -1,108 +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>Editing DTDs</title>
-</head>
-<body id="tedtdtd"><a name="tedtdtd"><!-- --></a>
-
-<h1 class="topictitle1">Editing DTDs</h1>
-<div><p>You can edit DTD files in both the Outline view and the Source
-view. Modifying the content of a DTD determines what can be used in any XML
-file that is associated with it.</p><div class="skipspace"><p>You can edit DTDs in the following ways:</p>
-<ul><li>Create or remove elements, attributes, entities, notations, and comments</li>
-<li>Edit an element's content model</li>
-<li>Edit a group</li>
-<li>Reuse entities</li>
-</ul>
-<p><b>Editing in the Outline view</b></p>
-<p>The Outline view will show
-you all the items in your DTD as you add them. In this view, you can both
-create and delete DTD nodes. </p>
-<p>The following instructions were written
-for the Resource perspective, but they will also work in many other perspectives.
-To edit a DTD in the Outline view, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new DTD or double-click an existing DTD in the Navigator
-view.</span> It will automatically open in the DTD editor.</li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD <img src="../images/nDTDFile.gif" alt="Image of the DTD file" /> and select the node you want to add to it.</span></li>
-<li class="skipspace"><span>In the Properties view, edit the fields for the node as appropriate.</span></li>
-</ol>
-<div class="skipspace"><p>The DTD editor has a built-in mechanism to handle referential integrity
-issues. When you delete or edit certain components, clean up will automatically
-occur. Refer to the related reference section for more information.</p>
-<p><b>Editing
-in the Source view</b></p>
-<p> You can edit the source code for your DTD in
-the Source view manually.</p>
-<p>The following instructions were written for
-the Resource perspective, but they will also work in many other perspectives.
-To edit a DTD in the Source view, follow these steps:</p>
-<ol><li>Create a new DTD or double-click an existing DTD in the Navigator view.
-It will automatically open in the DTD editor.</li>
-<li>Select the source code you want to edit - you can edit existing nodes
-or create new ones.</li>
-<li>Your changes to the DTD will automatically be reflected in the Outline
-and Properties views. If you have created any errors in your code while editing
-in the Source view, they will appear in the Problems view when you save or
-validate the file.</li>
-<li>The DTD editor has a built-in mechanism to handle referential integrity
-issues, however, this mechanism only works if you delete items using the Outline
-view or edit them in the Properties view. If you delete or edit items using
-the Source view, clean up will not automatically occur; instead you will receive
-error messages in the Problems view if you validate or save the file.</li>
-</ol>
-<p><b>Sorting nodes in the Outline view</b></p>
-<p>By default, DTD nodes
-appear in the Outline view in the order you added them to the DTD. </p>
-<p>If
-you want to sort the DTD nodes alphabetically, click the <span class="uicontrol">Sort
-items alphabetically</span> button <img src="../images/sort.gif" />. </p>
-<p>You
-can also group the DTD nodes into logical groups - notations, entities, elements,
-and other. Click the <span class="uicontrol">Group items logically</span> button <img src="../images/organize_dtd_logically.gif" /> to sort the DTD nodes into logical
-groups.</p>
-<p>The following links contain information on how you can edit
-DTD files:</p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/tcretelm.html">Creating elements</a></b><br />
-You can use element declarations in DTDs to define the elements that may occur in an XML document. Element declarations can specify that an element can contain other elements, that it can contain anything at all, or that it must be empty.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretent.html">Creating entities</a></b><br />
-An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretnot.html">Creating notations</a></b><br />
-Notations are means of associating a binary description with an entity or attribute. The most common uses of notations are to include familiar types of binary references, such as GIFs and JPGs, in an XML file.</div>
-<div class="ulchildlink"><b><a href="../topics/tcretcomm.html">Creating a comment</a></b><br />
-Comments can be used to provide information about a document, such as the author's name, or the date it was last modified. Comments are visible to anyone reading the DTD, but are ignored by the XML parser.</div>
-<div class="ulchildlink"><b><a href="../topics/tremvelm.html">Deleting elements, attributes, entities, notations, and comments</a></b><br />
-If you have created elements, attributes, entities, notations, and comments you no longer need, you can delete any of them.</div>
-</blockquote>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../topics/cdtdedit.html" title="After you have created or imported a DTD, you can open it in the DTD editor (by double-clicking it in the Navigator view), a tool for viewing and editing DTDs. You can use the DTD editor to perform a variety of tasks such as creating, editing, and deleting DTD elements, attributes, entities, notations, and comments">DTD editor</a><br />
-<a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-<a href="../topics/timptdtd.html" title="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor. The DTD editor provides you with a structured view of the DTD.">Importing DTDs</a><br />
-</p>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../topics/rrefint.html" title="The DTD editor has a built-in mechanism to handle referential integrity issues. When you delete or rename certain nodes, clean up for any nodes affected will automatically occur.">Referential integrity in the DTD editor</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html
deleted file mode 100644
index 6a85f7c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtgnde.html
+++ /dev/null
@@ -1,128 +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>Editing a group node</title>
-</head>
-<body id="tedtgnde"><a name="tedtgnde"><!-- --></a>
-
-<h1 class="topictitle1">Editing a group node</h1>
-<div><p>If your element has either element content or mixed content, its
-content model is represented by a group node. You can add children elements
-or another group to a group node, and specify how often, and
-in what manner a group of elements will be available in an XML file associated
-with your DTD.</p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>To
-edit a group node, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, expand the tree of the element you want to
-work with.</span></li>
-<li class="skipspace"><span>Click the group node you want to work with.</span></li>
-<li class="skipspace"><span>In the Design view, select <span class="uicontrol">Sequence</span> or <span class="uicontrol">Choice</span> from
-the <span class="uicontrol">Model Group</span> list.</span> This specifies whether
-the group of elements are sorted in sequence or are available as a choice
-in an XML file </li>
-<li class="skipspace"><span>Select the appropriate option from the <span class="uicontrol">Occurrence</span> list
-to indicate how often the group of elements can occur in an XML file associated
-with this DTD. </span></li>
-<li class="skipspace"><span>To add another existing element to a group as a child, right-click
-the group node, click <span class="uicontrol">Add Element to Content Model</span>,
-and specify its name.</span></li>
-<li class="skipspace"><span>You can also add a group to an existing group node, by right-clicking
-the group note and clicking <span class="uicontrol">Add Group to Content Model</span></span></li>
-</ol>
-<div class="skipspace"><p> <b>Note:</b>The <span class="uicontrol">Occurrence</span> option for the
-group node only specifies how often the entire group of elements can occur
-in an XML file. For each child element contained in the group, you can also
-specify how often it can occur (that is, how often a child element can occur
-is completely separate from how the often the group that contains it can occur).</p>
-<p> <b>Tip:</b>:
-To change the order of elements listed below a group node, simply click the
-element you want to move and drag it to the location you want it in.</p>
-</div>
-<div class="skipspace"><p><b>Creating a group node that contains a list of small pets</b></p>
-<p>The
-following steps show you how to create a group node that contains a list of
-small pets and explains how the choices you select affect how your group node
-(and the elements it contains) can be used in any XML files based on your
-DTD file:</p>
-<ol><li>Create a new DTD called <kbd class="userinput">Pets.dtd</kbd> and open it in
-the DTD editor.</li>
-<li>In the Outline view, right-click your DTD file, and create a new element <kbd class="userinput">SmallPets</kbd>.
-Also create three more elements - <kbd class="userinput">Cats</kbd>,<kbd class="userinput">Dogs</kbd>,
-and.<kbd class="userinput">Fish</kbd></li>
-<li>Expand <span class="uicontrol">SmallPets</span> and select the <span class="uicontrol">EMPTY</span> content
-model. Select <span class="uicontrol">Mixed Content</span> from the <span class="uicontrol">Content
-type</span> list. This means your <span class="uicontrol">SmallPets</span> element
-can contain both other elements and character data.</li>
-<li>Your content model is now represented by a group node <img src="../images/XSDChoice.gif" />.
-A #PCDATA element (for character data) and new child element are automatically
-created below it. Select the <span class="uicontrol">newChild</span> and select
- <span class="uicontrol">Dogs</span> in the <span class="uicontrol">Name</span> list.</li>
-<li>Right-click the group node and click <span class="uicontrol">Add Element to Content
-Model</span>. Select the new child node and select <span class="uicontrol">Cats</span> in
-the <span class="uicontrol">Name</span> list.</li>
-<li>Repeat the previous step and select <span class="uicontrol">Fish</span> in the <span class="uicontrol">Name</span> list.</li>
-<li>Now that you have created your list of small pets, you have to decide
-if you want users to be able to select all of them or just one of them in
-an XML file based on this Pets.dtd file. For example, you create a new XML
-file called <kbd class="userinput">Pets.xml</kbd> based on this DTD, and you create
-a <kbd class="userinput">SmallPets</kbd> element in it. If you selected <span class="uicontrol">Sequence</span> as
-the model group in the DTD file, then you can have all of the small pets ( <span class="uicontrol">Cats</span>,
- <span class="uicontrol">Dogs</span> and <span class="uicontrol">Fish</span>) in your <span class="uicontrol">SmallPets</span> element
-in the <span class="uicontrol">Pets.xml</span> file. If, however, you selected <span class="uicontrol">Choice</span> as
-the connector type, you can only have one animal listed in your <span class="uicontrol">SmallPets</span> element
-in the <span class="uicontrol">Pets.xml</span> file. You can have <span class="uicontrol">Cats</span> or
- <span class="uicontrol">Dogs</span> or <span class="uicontrol">Fish</span>, but you can
-only have one at a time.</li>
-<li>Now you have to decide how often this group of elements (the list of small
-pets) can occur in an XML file associated with this DTD. You can specify
-that it must appear only once ( <span class="uicontrol">Just once</span>), that it
-must appear one or more times ( <span class="uicontrol">One or more</span>), that
-it does not have to appear at all ( <span class="uicontrol">Optional</span>) or that
-it might not be used at all or might be used any number of times ( <span class="uicontrol">Zero
-or more</span>). <span class="uicontrol">Note</span>: You can also specify how
-often each child element can occur. How often a child element can occur is
-completely separate from how the often the group that contains it can occur.
-So, for example, you can specify that the <span class="uicontrol">SmallPets</span> group
-can occur <span class="uicontrol">Just once</span>, but the Cats element can appear
-several times (to do this, select the <span class="uicontrol">Cats</span> element
-and click <span class="uicontrol">One or more</span>).</li>
-<li>The order in which you specify child elements in a group affects how they
-can be used in any instances of the parent element in an XML file. For example,
-if, in your DTD file, you had specified this: <samp class="codeph"><!ELEMENT SmallPets
-(Dogs+ , Cats+ , Fish)+></samp>, any instances of<span class="uicontrol">SmallPets</span> in
-your <span class="uicontrol">Pets.xml</span> file must contain one or more instances
-of <span class="uicontrol">Dogs</span> followed by one or more instances of <span class="uicontrol">Cats</span>,
-followed by just one occurrence of <span class="uicontrol">Fish</span>. You could
-never have an occurrence of <span class="uicontrol">Fish</span> after <span class="uicontrol">Dogs</span> or <span class="uicontrol">Cats</span> before <span class="uicontrol">Dogs</span>. </li>
-<li>You can also add a group to an existing group node. Select the node, right-click
-it and click <span class="uicontrol">Add Group to Content Model</span>. You
-might want to add a group node, if you decided you wanted to sort the animals
-by breed into separate groups. </li>
-</ol>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tchgelm.html" title="An element's content model represents any data that can be contained inside or within the content of an element (that is, between the start and end tags of an element in an XML file). Editing an element's content model enables you to determine exactly what the element can (and cannot) contain.">Editing an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html
deleted file mode 100644
index 7187e24..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tgenxmls.html
+++ /dev/null
@@ -1,81 +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>Generating XML schemas from DTD files</title>
-</head>
-<body id="tgenxmls"><a name="tgenxmls"><!-- --></a>
-
-<h1 class="topictitle1">Generating XML schemas from DTD files</h1>
-<div><p>Generating an XML schema from a DTD file enables you to create
-an XML schema that is automatically populated with elements and attributes
-from your DTD file. This can save you time if you want to use an XML schema
-rather than a DTD file to validate your XML file, but you want to use the
-rules already set up in your DTD file.</p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To generate
-an XML schema file from a DTD file, follow these steps:</p>
-</div>
-<ol><li><span>In the Navigator view, right-click your DTD and click <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol"> XML Schema</span></span>.</span></li>
-<li><span>Select the project or folder that will contain the schema. </span></li>
-<li><span>Accept the default name or type a new one and click <span class="uicontrol">Next</span>.</span></li>
-<li><span>If you want to create an XML schema that will contain your DTD
-file and any DTD files it references, click the <span class="uicontrol">Create one XML
-schema that includes all the DTD files</span> radio button.</span></li>
-<li><span>Otherwise, if you want to create an individual schema for your
-DTD file and each DTD file it references, click the <span class="uicontrol">Create an XML
-schema for each DTD file</span> radio button.</span></li>
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-</ol>
-<div class="skipspace"><p>Your schemas appears in the Navigator view. They will have the
-same name as the DTD file they were generated from (if you accepted the default
-value in the <span class="uicontrol">File name</span> field when you generated the
-XML schema). </p>
-<p>Any entities that were in your DTD file will not be in
-the XML schema (as entities are not supported in XML schemas). However,
-any elements or attributes that referred to an entity will carry over that
-value to an XML schema.</p>
-</div>
-<div class="skipspace"><p>For example, you have a DTD called "Legal" that contains an entity
-called "Copyright". The value of the entity is "Copyright 2004. MyCompany
-Publishing" . In your DTD, you have an element called "MyCopyright", which
-refers to the entity Copyright. After you create the XML schema, the Copyright
-entity will not appear in the XML schema, however, its value is carried over
-(that is, MyCopyright will have the value: Copyright 2004. MyCompany Publishing
-).</p>
-<p>All elements and attributes that existed in your DTD file will exist
-in the XML schema file.</p>
-<p>Elements in your DTD with a content model of
-(#PCDATA) (and no attributes) appear empty in the XML schema editor. They
-are marked as having <span class="uicontrol">Built-in simple types</span> of <samp class="codeph">string</samp>.
-That is, a DTD element with a value of (#PCDATA) will map to an XML schema
-element with an XML schema primitive type <samp class="codeph">string</samp>.</p>
-<div class="note"><span class="notetitle">Note: </span>When
-you generate an XML schema from a DTD file that contains Hebrew or Arabic
-elements, certain element names might be encoded with their equivalent hexadecimal
-Hebrew and Arabic encoding values. To avoid this problem, change the encoding
-attribute of the original DTD or XML schema file to UTF-8 before performing
-the generation: That is, the XML declaration should be: <samp class="codeph"><?xml
-version="1.0" encoding="UTF-8"?></samp> The list of affected encoding values
-is: ISO-8859-8-I, ISO-8859-8, Windows-1256, and ISO-8859-6.</div>
-</div>
-</div>
-
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a><br />
-</p>
-<b>Related information</b><br /><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html">Editing XML schemas</a><br />
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
index 9252ea6..a6b92e6 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
@@ -21,25 +21,26 @@
<h1 class="topictitle1">Importing DTDs</h1>
<div><p>If you want to work with DTD files that you created outside of
the product, you can import them into the workbench and open them in the DTD
-editor. The DTD editor provides you with a structured view of
-the DTD.</p><div class="skipspace"><p>To import a DTD into the workbench, follow these steps:</p>
+editor.</p><div class="skipspace"><p>To import a DTD into the workbench, follow these steps:</p>
</div>
-<ol><li><span>Click <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Import</span></span>.</span></li>
-<li><span>Select the import source and click <span class="uicontrol">Next</span>.</span></li>
+<ol><li><span>Click <span class="menucascade"><span class="uicontrol"><b>File</span> > <span class="uicontrol">Import</b></span></span>.</span></li>
+<li><span>Select the import source and click <span class="uicontrol"><b>Next</b></span>.</span></li>
<li><span>Fill in the fields in the <span class="uicontrol">Import</span> wizard
as necessary.</span></li>
-<li><span>When you are finished, click <span class="uicontrol">Finish</span>.</span></li>
+<li><span>When you are finished, click <span class="uicontrol"><b>Finish</b></span>.</span></li>
<li><span>Select the DTD file in the Navigator view and double-click it to
open it in the DTD editor.</span></li>
</ol>
<div class="skipspace"><p>After you have imported a DTD file into the workbench and opened
-it in the DTD editor, you can edit it.</p>
+it in the DTD editor, you can edit it manually.</p>
</div>
</div>
+<div>
+<p>
+<b class="parentlink">Parent topic:</b> <a href="../topics/cworkdtds.html" title="Working with DTDs">Working with DTDs</a><br />
+</p>
+
+</div>
-<div><p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html
deleted file mode 100644
index 903c8bf..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tremvelm.html
+++ /dev/null
@@ -1,64 +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>Deleting elements, attributes, entities, notations, and comments</title>
-</head>
-<body id="tremvelm"><a name="tremvelm"><!-- --></a>
-
-<h1 class="topictitle1">Deleting elements, attributes, entities, notations, and comments</h1>
-<div><p>If you have created elements, attributes, entities, notations,
-and comments you no longer need, you can delete any of them. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To delete
-an element, attribute, entity, notation or comment:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>In the Outline view, click the element, attribute, entity, notation,
-or comment you want to delete.</span> If you want to delete more
-than one item, hold down the<span class="uicontrol">Ctrl</span> key while you select
-items.</li>
-<li class="skipspace"><span>Right-click the item (or one of the items if you have selected
-more than one), and, from its pop-up menu, click <span class="uicontrol">Delete</span>.</span></li>
-</ol>
-<div class="skipspace"><p>You can "undo" the deletion of an item. To do so, right-click any
-element, attribute, entity, notation, or comment and click <span class="uicontrol">Undo
-Delete</span>. You must do this before you close the editor, otherwise,
-your items will no longer exist on the system and you will have to recreate
-them if you want them again.</p>
-<p>The DTD editor has a built-in mechanism
-to handle referential integrity issues. When you delete or rename certain
-nodes, clean up will automatically occur. </p>
-</div>
-</div>
-
-<div>
-<blockquote>
-<div class="ulchildlink"><b><a href="../topics/rrefint.html">Referential integrity in the DTD editor</a></b><br />
-The DTD editor has a built-in mechanism to handle referential integrity issues. When you delete or rename certain nodes, clean up for any nodes affected will automatically occur.</div>
-</blockquote>
-
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tedtdtd.html" title="You can edit DTD files in both the Outline view and the Source view. Modifying the content of a DTD determines what can be used in any XML file that is associated with it.">Editing DTDs</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/tcretattr.html" title="You can use an attribute to describe an element or provide information about it. Attribute lists enable you to group together all related attributes for an element.">Creating attributes and attribute lists</a><br />
-<a href="../topics/tcretcomm.html" title="Comments can be used to provide information about a document, such as the author's name, or the date it was last modified. Comments are visible to anyone reading the DTD, but are ignored by the XML parser.">Creating a comment</a><br />
-<a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-<a href="../topics/tcretnot.html" title="Notations are means of associating a binary description with an entity or attribute. The most common uses of notations are to include familiar types of binary references, such as GIFs and JPGs, in an XML file.">Creating notations</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html
deleted file mode 100644
index 57c612b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusents.html
+++ /dev/null
@@ -1,95 +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>Reusing the value of one entity in another entity</title>
-</head>
-<body id="trusents"><a name="trusents"><!-- --></a>
-
-<h1 class="topictitle1">Reusing the value of one entity in another entity</h1>
-<div><p>Reusing the value of an entity in another entity can save you time
-in several ways. For example, if your value is long and complicated, it is
-much faster to simply reuse an entity than manually type in your value each
-time. As well, if the value changes, you only have to change it in one location.</p><div class="skipspace"><p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives. </p>
-<p>You
-can create an entity that reuses another entity. To do so, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your DTD in the DTD editor.</span></li>
-<li class="skipspace"><span>Create an entity.</span> <ol type="a"><li><span>Type a name for the entity and select <span class="uicontrol">Parameter</span> from
-the <span class="uicontrol">Entity type</span> list.</span></li>
-<li><span>Type the value of the entity in the <span class="uicontrol">Entity Value</span> field.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Create another entity.</span><ol type="a"><li><span>Type a name and select <span class="uicontrol">General</span> from the <span class="uicontrol">Entity
-type</span> list.</span></li>
-<li><span>In the <span class="uicontrol">Entity Value</span> field, type a reference
-to the first parameter entities' value (that is, type %<var class="varname">parmentityname</var>;)</span></li>
-</ol>
-</li>
-</ol>
-<div class="skipspace"><p>You now have two entities with the exact same value. </p>
-</div>
-<div class="skipspace">The following sample shows how you might create an entity that reuses
-the value of another entity.<p>You need to place a copyright at the end of
-every page of a book. On even pages, you need to put "Copyright 2003" and
-on odd pages, you need to put "Copyright 2003. MyCompany Publishing." First
-you will declare an entity with the simpler value and then create an entity
-with the more complicated value.</p>
-<ol><li>Open your DTD in the DTD editor.</li>
-<li>Create an entity. In the <span class="uicontrol">Name</span> field, type <kbd class="userinput">CopyrightDate</kbd>.
-Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity type</span> list.
-In the <span class="uicontrol">Entity Value</span>, type <kbd class="userinput">Copyright 2003</kbd>.</li>
-<li>Create another entity. In the <span class="uicontrol">Name</span> field, type <kbd class="userinput">CompanyCopyright</kbd>.
-Select <span class="uicontrol">General</span> from the <span class="uicontrol">Entity type</span> list.
-In the<span class="uicontrol">Entity Value</span> field, type <kbd class="userinput">%CopyrightDate;
-MyCompany Publishing</kbd>.</li>
-</ol>
-<p>Now, if you need to change the copyright date, you only need to do
-so in one place, not two.</p>
-<p> <b>Note</b>: Since you had to make the CopyrightDate
-entity a <span class="uicontrol">Parameter</span> entity in order to be able to reference
-it in the CompanyCopyright entity, you cannot use it in an XML file.
-You would have to create a third entity called <kbd class="userinput">XMLCopyrightDate</kbd> with
-a value of <kbd class="userinput">%CopyrightDate;</kbd> and use it instead in the
-XML file.</p>
-<p>To use the entity in an XML document, you must use the ampersand <kbd class="userinput">&</kbd> followed
-by the name of the entity, and then end with the semi-colon <kbd class="userinput">;</kbd>.
-So, in an XML document, if you were working with an even page, you would need
-to put this:</p>
-<p><kbd class="userinput">&XMLCopyrightDate; </kbd></p>
-<p> to
-call the XMLCopyrightDate entity. Remember, you cannot call the CopyrightDate
-entity because you had to make it a <span class="uicontrol">Parameter</span> entity
-in order to be able to reference it in the CompanyCopyright entity.</p>
-<p>If
-you were working with an odd page, you would need to put this:</p>
-<p><kbd class="userinput">&CompanyCopyright; </kbd></p>
-<p> to
-call the CompanyCopyright entity.</p>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusintp.html" title="Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity). ">Reusing internal parameter entities in an attribute name or type</a><br />
-<a href="../topics/trusextp.html" title="Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.">Reusing external parameter entities in an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html
deleted file mode 100644
index 41df9bd..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusextp.html
+++ /dev/null
@@ -1,104 +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>Reusing external parameter entities in an element's content model</title>
-</head>
-<body id="trusextp"><a name="trusextp"><!-- --></a>
-
-<h1 class="topictitle1">Reusing external parameter entities in an element's content model</h1>
-<div><p>Using an entity in a content model can save you time if you want
-to have the same information in several content models. You can create a DTD
-that references another DTD and then declares an element whose content model
-refers to a parameter entity created in another DTD. </p><div class="skipspace"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives. </p>
-<p>To create
-a DTD that reuses an external parameter entity in an element's content model,
-follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Create a new DTD.</span> If you want to work with an existing
-DTD, open your DTD in the DTD editor.</li>
-<li class="skipspace"><span>Create an entity (for example, <kbd class="userinput">MyEntity</kbd>).</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list, and type a value for the entity in the <span class="uicontrol">Entity
-value</span> field. </span></li>
-<li class="skipspace"><span>Save your DTD file.</span></li>
-<li class="skipspace"><span>Create another DTD.</span></li>
-<li class="skipspace"><span>Create another entity (for example, <kbd class="userinput">MySecondEntity</kbd>). </span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list and select the <span class="uicontrol">External</span> check
-box to declare this as an external entity.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">System ID</span> field, type the path of
-the DTD (or click the <span class="uicontrol">More</span> button to browse for a file)
-you created in step 1 . The path is relative to the workspace root.</span></li>
-<li class="skipspace"><span>(Optional) Type a value in the <span class="uicontrol">Public ID</span> field.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click the DTD and click <span class="uicontrol">Add
-Parameter Entity Reference</span> to add a reference to the entity you
-created in step 6 (for example, <kbd class="userinput">MySecondEntity</kbd>).</span></li>
-<li class="skipspace"><span>Add an element.</span></li>
-<li class="skipspace"><span>Change the content type for this element from EMPTY to the
-value you specified in step 2 (for example,<kbd class="userinput">MyEntity</kbd>).</span> Note how you can select the value you specified in step 2 in the list
-for the content element. This is because you included the first DTD that you
-created in an earlier step.</li>
-</ol>
-<div class="skipspace"><p>You now have a DTD that references another DTD and declares an
-element whose content model refers to a parameter entity created in the other
-DTD. </p>
-</div>
-<div class="skipspace"><p>The following sample shows how you might reuse external parameter
-entities in an element's content model.</p>
-<p>You are making a list of everything
-you have in both your work office and your home office. You have a computer
-in each office and you do not want to write out a list of each part of your
-computer more than once.</p>
-<ol><li>Create a new DTD called <kbd class="userinput">WorkOffice.dtd.</kbd>.</li>
-<li>Create the following four elements: <kbd class="userinput">Monitor</kbd>,<kbd class="userinput">Keyboard</kbd>, <kbd class="userinput">Mouse</kbd>,
-and <kbd class="userinput">Hard_Drive</kbd>. Make the value of each element <span class="uicontrol">(#PCDATA)</span>.</li>
-<li>Add an entity called <kbd class="userinput">WorkComp</kbd>. Select <span class="uicontrol">Parameter</span> as
-the <span class="uicontrol">Entity type</span>. In the <span class="uicontrol">Value</span> field,
-type: <kbd class="userinput">(Monitor, Keyboard, Mouse, Hard_Drive)</kbd>. Click
- <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol"> Save</span></span></li>
-<li>Create another DTD called <kbd class="userinput">HomeOffice.dtd</kbd></li>
-<li>Add an entity called <kbd class="userinput">HomeComp</kbd> to your HomeOffice.dtd
-. Select <span class="uicontrol">Parameter</span> as the <span class="uicontrol">Entity type</span> and
-click the <span class="uicontrol">External</span> check box to declare this as an
-external entity. In the <span class="uicontrol">System ID</span> field, type the path
-(or click the <span class="uicontrol">More</span> button to browse for the file) of <span class="uicontrol">WorkOffice.dtd</span>.
-The path is relative to the workspace root.</li>
-<li>(Optional) Type a value in the <span class="uicontrol">Public ID</span> field.</li>
-<li>In the Outline view, right-click the DTD and select <span class="uicontrol">Add Parameter
-Entity Reference</span> to add the entity you created earlier (that is,
-%HomeComp;).</li>
-<li>Add an element called <kbd class="userinput">MyHomeComp</kbd>. Change the content
-model for MyHomeComp from <span class="uicontrol">EMPTY</span> to <b>Work Office:
-%WorkComp;</b>. The value of MyHomeComp is now: <b>Monitor Keyboard Mouse
-Hard_Drive</b>. Note how you can select the value you specified in step
-4 in the <span class="uicontrol">Content type</span> list for the content element.
-This is because you included the first DTD you created in an earlier step.</li>
-</ol>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusents.html" title="Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.">Reusing the value of one entity in another entity</a><br />
-<a href="../topics/trusintp.html" title="Reusing parameter entities in attributes can save you a lot of time. If you have several elements using the exact same attribute, you only have to input the information once (into an entity). ">Reusing internal parameter entities in an attribute name or type</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html
deleted file mode 100644
index 20ac729..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/trusintp.html
+++ /dev/null
@@ -1,75 +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>Reusing internal parameter entities in an attribute name or type</title>
-</head>
-<body id="trusintp"><a name="trusintp"><!-- --></a>
-
-<h1 class="topictitle1">Reusing internal parameter entities in an attribute name or type</h1>
-<div><p>Reusing parameter entities in attributes can save you a lot of
-time. If you have several elements using the exact same attribute, you only
-have to input the information once (into an entity). </p><div class="skipspace"><p></p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives. </p>
-<p>You
-can create a DTD that reuses internal parameter entities in attributes. To
-reuse internal parameter entities in attributes, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>In the workbench, create a new DTD.</span></li>
-<li class="skipspace"><span>Add a new entity to the DTD you just created.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Parameter</span> from the <span class="uicontrol">Entity
-type</span> list, and type a value in the <span class="uicontrol">Entity Value</span> field.</span></li>
-<li class="skipspace"><span>Create an element and add an attribute to it. </span></li>
-<li class="skipspace"><span>If you want to reuse the entity in an attribute name, in the <span class="uicontrol">Name</span> field
-for the attribute, type the name of the entity (that is, %NewEntity;) then
-in the <span class="uicontrol">Type</span> field, select the type for the attribute.</span> <b>Tip</b>: If you want to use an entity to replace an entire attribute
-definition, select <span class="uicontrol">(none)</span> from the <span class="uicontrol">Type</span> list.</li>
-<li class="skipspace"><span>If you want to reuse the entity as the type of an attribute, type
-the name of the attribute, and, in the <span class="uicontrol">Type</span> field,
-click the name of the entity you created in step 2.</span></li>
-<li class="skipspace"><span>Repeat steps 4 and 5 or 4 and 6 as applicable.</span></li>
-</ol>
-<div class="skipspace">You now have two attributes with the same name or type.</div>
-<div class="skipspace"><p> The following sample shows how you might reuse internal parameter
-entities in an attribute type.</p>
-<p>You are making a list of office supplies,
-and all your supplies have Part and Stock attributes.</p>
-<ol><li>Create a new DTD called <kbd class="userinput">OfficeSupplies.dtd</kbd> .</li>
-<li>Add an entity called <kbd class="userinput">PartStock</kbd>. Select <span class="uicontrol">Parameter</span> from
-the <span class="uicontrol">Entity type</span> list. In the <span class="uicontrol">Entity Value</span> field,
-type <kbd class="userinput">Part ID #REQUIRED Stock CDATA #IMPLIED</kbd>.</li>
-<li>Add three new elements to OfficeSupplies.dtd: <kbd class="userinput">pen</kbd>, <kbd class="userinput">paper</kbd>,
-and <kbd class="userinput">pencils</kbd>. Make the value of each element <span class="uicontrol">(#PCDATA)</span>.</li>
-<li>Right-click <span class="uicontrol">pen</span> and click <span class="uicontrol">Add Attribute</span>.
-In the <span class="uicontrol">Name</span> field for the attribute, type <kbd class="userinput">ID_Numbers</kbd>.
-In the <span class="uicontrol">Type</span> field, click <span class="uicontrol"> %PartStock;</span>.</li>
-<li>Repeat step 4 for <span class="uicontrol">paper</span> and <span class="uicontrol">pencils.</span></li>
-</ol>
-<p>You now have three elements with the same attribute. </p>
-</div>
-</div>
-
-<div>
-<p>
-<b class="parentlink">Parent topic:</b> <a href="../topics/tcretent.html" title="An entity is a shortcut used to represent complex strings or symbols that would otherwise be impossible, difficult or repetitive to include by hand.">Creating entities</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../topics/trusents.html" title="Reusing the value of an entity in another entity can save you time in several ways. For example, if your value is long and complicated, it is much faster to simply reuse an entity than manually type in your value each time. As well, if the value changes, you only have to change it in one location.">Reusing the value of one entity in another entity</a><br />
-<a href="../topics/trusextp.html" title="Using an entity in a content model can save you time if you want to have the same information in several content models. You can create a DTD that references another DTD and then declares an element whose content model refers to a parameter entity created in another DTD.">Reusing external parameter entities in an element's content model</a><br />
-</p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
index 508ba39..973982a 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
@@ -25,21 +25,28 @@
<p>To validate
a DTD, follow these steps:</p>
</div>
-<div class="p"><span>In the Navigator view, right-click the DTD and click <span class="menucascade"><span class="uicontrol">Validate DTD File</span></span>.</span></div>
+<div class="p"><span>In the Navigator view, right-click the DTD and click <span class="menucascade"><span class="uicontrol"><b>Validate DTD File</b></span></span>.</span></div>
<div class="skipspace">A dialog opens, indicating if the DTD file was successfully validated
or not. If the file is invalid, any errors will appear in the Problems view.
<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 might have to select the <span class="uicontrol">Override
-validation preferences</span> check box in order to enable the <span class="uicontrol">Maximum
-number of validation messages</span> field</p>
+allowed by selecting <span class="menucascade"><span class="uicontrol"><b>Properties</span> > <span class="uicontrol">Validation</b></span></span> from the project's pop-up menu and specifying the maximum number
+of error messages allowed. You might have to select the <span class="uicontrol"><b>Override
+validation preferences</span></b> check box in order to enable the <span class="uicontrol"><b>Maximum
+number of validation messages</b></span> field.</p>
<p>You can set up 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
+validated when you save them. From a project's pop-up menu select <b><span class="uicontrol">Properties</span></b>,
+then select <span class="uicontrol"><b>Validation</b></span>. Any validators you can run
against your project will be listed in the Validation page. </p>
</div>
</div>
+
+<div>
+<p>
+<b class="parentlink">Parent topic:</b> <a href="../topics/cworkdtds.html" title="Working with DTDs">Working with DTDs</a><br />
+</p>
+
+</div>
</body>
</html>
\ No newline at end of file