[225423] updates to xml editor docs for WTP 3.0
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
index 5292124..2ccd930 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
@@ -2,7 +2,7 @@
<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
"map.dtd">
-<map collection-type="sequence" title="Developing XML files">
+<map collection-type="sequence" id="xmleditordocumentation" title="Developing XML files">
<topicref href="topics/cworkXML.dita" linking="sourceonly" navtitle="Working with XML files">
<anchor id="xml_post_cworkXML"/>
<topicref href="topics/ccreatxm.dita" navtitle="Creating XML files">
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
index 74ddb7c..fdaba04 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">
-<map>
-<topicgroup collection-type="family"><?Pub Caret1?>
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
+ "map.dtd">
+<map id="xmleditorreltable">
+<topicgroup collection-type="family">
<topicref href="topics/tcretxml.dita" id="xmlcretxml" navtitle="Creating empty XML files">
</topicref>
<topicref href="topics/tcrexdtd.dita" navtitle="Generating XML files from DTDs">
@@ -133,4 +134,3 @@
</topicref>
</topicgroup>
</map>
-<?Pub *0000006002?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
index 1ebbd51..ef49057 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
index e4aa40e..9775da8 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
index 34a2e0f..1e406fa 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
<concept id="cwxmledt" xml:lang="en-us">
<title>XML editor</title>
<titlealts>
@@ -21,7 +22,7 @@
<li>Associating XML files with DTDs or XML schemas</li>
</ul>
<p>The XML editor has two main views - the Source view and the Design view.
-You can also use the <b>Outline</b> view to insert and delete elements.</p>
+You can also use the Outline view to insert and delete elements.</p>
<section><title>Source view</title><p>The Source view enables you to view
and work directly with a file's source code. Many of the XML editing features
in the XML editor Source view are very similar to those available in the Source
@@ -30,27 +31,26 @@
<li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>
<li> Content assist, which uses the information in a DTD or schema content
model to provide a list of acceptable continuations depending on where the
-cursor is located in an XML file, or what has just been type</li>
+cursor is located in an XML file, or what has just been typed.</li>
<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute
value, one double-click selects that value, another double click selects the
attribute-value pair, and a third double-click selects the entire tag. This
makes it easier to copy and paste commonly used pieces of XML.</li>
</ul></p></section>
<section><title>Design view</title><p>The XML editor also has a Design view.
-In it: <ul>
+This view has the following features:<ul>
<li>The XML file is represented simultaneously as a table and a tree. This
helps make navigation and editing easier.</li>
<li>Content and attribute values can be edited directly in the table cells,
while pop-up menus on the tree nodes give alternatives that are valid for
-that location. For example, the <uicontrol>Add child</uicontrol> menu item
+that location. For example, the <uicontrol>Add Child</uicontrol> menu item
will list only those elements from a DTD or XML schema which would be valid
children at that point (as long as grammar constraints are on).</li>
</ul></p><p>The Design view is especially helpful if you are new to XML, or
need to do form-oriented editing. For example, you could use the Create XML
File wizard to create a template XML file for a job description form from
-a job description DTD. After those steps are completed, you would
-only have to fill in the form data using the Design view.</p><p>The following
-links provide more information about the XML editor:</p></section>
+a job description DTD. After those steps are completed, you would only have
+to fill in the form data using the Design view.</p><p></p><?Pub Caret1?></section>
</conbody>
</concept>
-<?Pub *0000002994?>
+<?Pub *0000002948?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
index 0515a1d..a0d3a4e 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -52,7 +52,7 @@
</ul>
<p>The XML editor has two main views - the Source view and the Design view.
-You can also use the <strong>Outline</strong> view to insert and delete elements.</p>
+You can also use the Outline view to insert and delete elements.</p>
<div class="section"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
and work directly with a file's source code. Many of the XML editing features
@@ -64,7 +64,7 @@
<li> Content assist, which uses the information in a DTD or schema content
model to provide a list of acceptable continuations depending on where the
-cursor is located in an XML file, or what has just been type</li>
+cursor is located in an XML file, or what has just been typed.</li>
<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute
value, one double-click selects that value, another double click selects the
@@ -76,13 +76,13 @@
</div>
<div class="section"><h4 class="sectiontitle">Design view</h4><div class="p">The XML editor also has a Design view.
-In it: <ul>
+This view has the following features:<ul>
<li>The XML file is represented simultaneously as a table and a tree. This
helps make navigation and editing easier.</li>
<li>Content and attribute values can be edited directly in the table cells,
while pop-up menus on the tree nodes give alternatives that are valid for
-that location. For example, the <span class="uicontrol">Add child</span> menu item
+that location. For example, the <span class="uicontrol">Add Child</span> menu item
will list only those elements from a DTD or XML schema which would be valid
children at that point (as long as grammar constraints are on).</li>
@@ -91,10 +91,9 @@
<p>The Design view is especially helpful if you are new to XML, or
need to do form-oriented editing. For example, you could use the Create XML
File wizard to create a template XML file for a job description form from
-a job description DTD. After those steps are completed, you would
-only have to fill in the form data using the Design view.</p>
-<p>The following
-links provide more information about the XML editor:</p>
+a job description DTD. After those steps are completed, you would only have
+to fill in the form data using the Design view.</p>
+<p />
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
index fc8a56b..78efa4f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
"concept.dtd">
<concept id="cxmlcat" xml:lang="en-us">
@@ -13,49 +13,45 @@
and conform to all of the declarations in the DTD or the XML schema.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML catalog<indexterm>overview</indexterm></indexterm>
-<indexterm>XML files<indexterm>associations</indexterm></indexterm>
-</keywords>
+<indexterm>XML files<indexterm>associations</indexterm></indexterm></keywords>
</metadata></prolog>
<conbody>
<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>
<ol>
<li>Direct association - The XML file contains either the name of a DTD in
-its doctype declaration (for example, <!DOCTYPE root-element SYSTEM " <varname>dtdfile.dtd</varname>"
->, where <varname>dtdfile.dtd</varname> is the name of the DTD file) or it
+its doctype declaration (for example, <!DOCTYPE root-element SYSTEM "<varname>dtdfile.dtd</varname>"
+>, where <varname>dtdfile.dtd</varname> is the name of the DTD file) or it
contains the path of an XML schema in the schemaLocation attribute of the
-XML file root element (for example, <xsi:schemaLocation="http://www.ibm.com
- <varname>schema.xsd</varname>">, where <varname>schema.xsd</varname> is
-the name of the XML schema.</li>
+XML file root element (for example, <xsi:schemaLocation="http://www.ibm.com/<varname>schema.xsd</varname>">,
+where <varname>schema.xsd</varname> is the name of the XML schema.</li>
<li>XML Catalog entry - You can register DTD and XML schema files in the XML
-Catalog and associate them with a <varname>Key</varname> that represents
-them. You can then refer to a DTD or XML schema file <varname>Key</varname> from
-an XML file instead of referring directly to the DTD or XML schema file. An
-XML Catalog entry contains two parts - the Key (which represents the DTD or
-XML schema) and a URI (which contains information about the DTD or XML schema
-location).</li>
+Catalog and associate them with a Key that represents them. You can then
+refer to a DTD or XML schema file Key from an XML file instead of referring
+directly to the DTD or XML schema file. An XML Catalog entry contains two
+parts - the Key (which represents the DTD or XML schema) and a URI (which
+contains information about the DTD or XML schema location).</li>
</ol>
<section><title>How an association works</title><b>Associating an XML file
with a DTD </b><p>If an XML file is associated with a DTD, a DOCTYPE tag such
as the following one is included in the XML file:<codeblock><!DOCTYPE root-name PUBLIC "<varname>InvoiceId</varname>" "<varname>C:\mydtds\Invoice.dtd</varname
>">
-</codeblock></p><p><varname>InvoiceId</varname> is the public identifier of
-the DTD file. It is used to associate the XML file with a DTD file (in this
-case, the DTD file is <varname>Invoice.dtd</varname>). If the public identifier
-InvoiceId corresponds to the <varname>Key</varname> of the XML Catalog entry
-for Invoice.dtd, then the <varname>URI</varname> of the XML Catalog entry
-(which contains information about the location of Invoice.dtd) is used to
-locate the DTD. Otherwise, the DOCTYPE's system identifier ( <varname>"C:\mydtds\Invoice.dtd"</varname>),
+</codeblock></p><p>InvoiceId is the public identifier of the DTD file. It
+is used to associate the XML file with a DTD file (in this case, the DTD file
+is Invoice.dtd). If the public identifier InvoiceId corresponds to the Key
+of the XML Catalog entry for Invoice.dtd, then the U<?Pub Caret?>RI of the
+XML Catalog entry (which contains information about the location of Invoice.dtd)
+is used to locate the DTD. Otherwise, the DOCTYPE's system identifier ("C:\mydtds\Invoice.dtd"),
which refers directly to the file system location of the DTD, is used to locate
-the DTD.</p><p> <b>Note</b>: You can also use a system identifier as a Key
-in an XML Catalog entry. If you use a system identifier as a Key, a DOCTYPE
-tag such as the following one is included in an XML file:</p><codeblock><!DOCTYPE Root-name SYSTEM "<varname>MyDTD.dtd</varname>"> </codeblock
-><p>where <varname>MyDTD.dtd</varname> is the system identifier that corresponds
-to the Key of an XML Catalog entry.</p></section>
+the DTD.</p><note>You can also use a system identifier as a Key in an XML
+Catalog entry. If you use a system identifier as a Key, a DOCTYPE tag such
+as the following one is included in an XML file:</note><codeblock><!DOCTYPE Root-name SYSTEM "MyDTD.dtd"> </codeblock><p>where
+MyDTD.dtd is the system identifier that corresponds to the Key of an XML Catalog
+entry.</p></section>
<section><b>Associating an XML file with an XML schema</b><p>If an XML file
is associated with an XML schema, one or more schema location attributes are
included in the XML file. The information in the schemaLocation is provided
as a "hint" to the XML processor. The following examples show schemaLocation
-attributes.</p><p> <b>Example 1 </b><codeblock><purchaseOrder xmlns="http://www.ibm.com"
+attributes:</p><p> <b>Example 1 </b><codeblock><purchaseOrder xmlns="http://www.ibm.com"
xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd">
<shipTo country="US">
...</codeblock> </p><p><b>Example 2 </b><codeblock><purchaseOrder xmlns="http://www.ibm.com"
@@ -90,11 +86,10 @@
DTD or XML schema (using a Web browser, for example) and save that copy on
your local machine. Then, you can either place a local copy in the same project
as your XML file, or use the XML Catalog to associate a public identifier
-with the DTD's (local) location.</p><p><b>Note</b>: If you have an XML file
-associated with an XML schema or DTD that is elsewhere in the network, and
-you are working on a machine disconnected from the network, you can follow
-the steps described previously if you want to use content assist or validate
-your XML file. </p></section>
+with the DTD's (local) location.</p><note>If you have an XML file associated
+with an XML schema or DTD that is elsewhere in the network, and you are working
+on a machine disconnected from the network, you can follow the steps described
+previously if you want to use content assist or validate your XML file. </note></section>
<section><title>Advantages of XML Catalog entry associations</title><p>If
you create a direct association between an XML file and an XML schema or DTD
file, any time you change the location of the schema or DTD you have to track
@@ -102,7 +97,7 @@
the DTD or schema. If, however, you associate an XML file with an XML schema
or DTD Key, then, when you change the location of the schema or DTD, you only
have to update the XML Catalog entry, instead of each individual XML file.</p><p>For
-example, you have a DTD called "Building.dtd", which is associated with five
+example, you have a DTD called Building.dtd, which is associated with five
XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
You move the DTD file Building.dtd to a new location. If you have a direction
association between Building.dtd and all the XML files, you will have to update
@@ -121,3 +116,4 @@
to the related tasks.</p></section>
</conbody>
</concept>
+<?Pub *0000008359?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
index cb76c14..7a58bec 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="XML file associations with DTDs and XML schemas" />
<meta name="abstract" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
<meta name="description" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
-<meta content="XML files, associating with DTDs, associating with XML schemas, XML catalog, overview" name="DC.subject" />
-<meta content="XML files, associating with DTDs, associating with XML schemas, XML catalog, overview" name="keywords" />
+<meta content="XML catalog, overview, XML files, associations" name="DC.subject" />
+<meta content="XML catalog, overview, XML files, associations" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
@@ -48,20 +48,18 @@
<ol>
<li>Direct association - The XML file contains either the name of a DTD in
-its doctype declaration (for example, <!DOCTYPE root-element SYSTEM " <var class="varname">dtdfile.dtd</var>"
->, where <var class="varname">dtdfile.dtd</var> is the name of the DTD file) or it
+its doctype declaration (for example, <!DOCTYPE root-element SYSTEM "<var class="varname">dtdfile.dtd</var>"
+>, where <var class="varname">dtdfile.dtd</var> is the name of the DTD file) or it
contains the path of an XML schema in the schemaLocation attribute of the
-XML file root element (for example, <xsi:schemaLocation="http://www.ibm.com
- <var class="varname">schema.xsd</var>">, where <var class="varname">schema.xsd</var> is
-the name of the XML schema.</li>
+XML file root element (for example, <xsi:schemaLocation="http://www.ibm.com/<var class="varname">schema.xsd</var>">,
+where <var class="varname">schema.xsd</var> is the name of the XML schema.</li>
<li>XML Catalog entry - You can register DTD and XML schema files in the XML
-Catalog and associate them with a <var class="varname">Key</var> that represents
-them. You can then refer to a DTD or XML schema file <var class="varname">Key</var> from
-an XML file instead of referring directly to the DTD or XML schema file. An
-XML Catalog entry contains two parts - the Key (which represents the DTD or
-XML schema) and a URI (which contains information about the DTD or XML schema
-location).</li>
+Catalog and associate them with a Key that represents them. You can then
+refer to a DTD or XML schema file Key from an XML file instead of referring
+directly to the DTD or XML schema file. An XML Catalog entry contains two
+parts - the Key (which represents the DTD or XML schema) and a URI (which
+contains information about the DTD or XML schema location).</li>
</ol>
@@ -70,28 +68,28 @@
as the following one is included in the XML file:<pre><!DOCTYPE root-name PUBLIC "<var class="varname">InvoiceId</var>" "<var class="varname">C:\mydtds\Invoice.dtd</var>">
</pre>
</div>
-<p><var class="varname">InvoiceId</var> is the public identifier of
-the DTD file. It is used to associate the XML file with a DTD file (in this
-case, the DTD file is <var class="varname">Invoice.dtd</var>). If the public identifier
-InvoiceId corresponds to the <var class="varname">Key</var> of the XML Catalog entry
-for Invoice.dtd, then the <var class="varname">URI</var> of the XML Catalog entry
-(which contains information about the location of Invoice.dtd) is used to
-locate the DTD. Otherwise, the DOCTYPE's system identifier ( <var class="varname">"C:\mydtds\Invoice.dtd"</var>),
+<p>InvoiceId is the public identifier of the DTD file. It
+is used to associate the XML file with a DTD file (in this case, the DTD file
+is Invoice.dtd). If the public identifier InvoiceId corresponds to the Key
+of the XML Catalog entry for Invoice.dtd, then the URI of the
+XML Catalog entry (which contains information about the location of Invoice.dtd)
+is used to locate the DTD. Otherwise, the DOCTYPE's system identifier ("C:\mydtds\Invoice.dtd"),
which refers directly to the file system location of the DTD, is used to locate
the DTD.</p>
-<p> <strong>Note</strong>: You can also use a system identifier as a Key
-in an XML Catalog entry. If you use a system identifier as a Key, a DOCTYPE
-tag such as the following one is included in an XML file:</p>
-<pre><!DOCTYPE Root-name SYSTEM "<var class="varname">MyDTD.dtd</var>"> </pre>
-<p>where <var class="varname">MyDTD.dtd</var> is the system identifier that corresponds
-to the Key of an XML Catalog entry.</p>
+<div class="note"><span class="notetitle">Note:</span> You can also use a system identifier as a Key in an XML
+Catalog entry. If you use a system identifier as a Key, a DOCTYPE tag such
+as the following one is included in an XML file:</div>
+<pre><!DOCTYPE Root-name SYSTEM "MyDTD.dtd"> </pre>
+<p>where
+MyDTD.dtd is the system identifier that corresponds to the Key of an XML Catalog
+entry.</p>
</div>
<div class="section"><strong>Associating an XML file with an XML schema</strong><p>If an XML file
is associated with an XML schema, one or more schema location attributes are
included in the XML file. The information in the schemaLocation is provided
as a "hint" to the XML processor. The following examples show schemaLocation
-attributes.</p>
+attributes:</p>
<div class="p"> <strong>Example 1 </strong><pre><purchaseOrder xmlns="http://www.ibm.com"
xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd">
<shipTo country="US">
@@ -141,11 +139,10 @@
your local machine. Then, you can either place a local copy in the same project
as your XML file, or use the XML Catalog to associate a public identifier
with the DTD's (local) location.</p>
-<p><strong>Note</strong>: If you have an XML file
-associated with an XML schema or DTD that is elsewhere in the network, and
-you are working on a machine disconnected from the network, you can follow
-the steps described previously if you want to use content assist or validate
-your XML file. </p>
+<div class="note"><span class="notetitle">Note:</span> If you have an XML file associated
+with an XML schema or DTD that is elsewhere in the network, and you are working
+on a machine disconnected from the network, you can follow the steps described
+previously if you want to use content assist or validate your XML file. </div>
</div>
<div class="section"><h4 class="sectiontitle">Advantages of XML Catalog entry associations</h4><p>If
@@ -156,7 +153,7 @@
or DTD Key, then, when you change the location of the schema or DTD, you only
have to update the XML Catalog entry, instead of each individual XML file.</p>
<p>For
-example, you have a DTD called "Building.dtd", which is associated with five
+example, you have a DTD called Building.dtd, which is associated with five
XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
You move the DTD file Building.dtd to a new location. If you have a direction
association between Building.dtd and all the XML files, you will have to update
@@ -183,12 +180,12 @@
<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
+<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
+<div><a href="../topics/tedtproc.html" title="If you have instructions you want to send to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
index 21aa590..a291679 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
<?Pub Inc?>
<concept id="cxmlenc" xml:lang="en-us">
<title>XML and HTML encodings</title>
@@ -40,19 +41,10 @@
<entry> <p>EUC encoding, Korean</p> </entry>
</row>
<row>
-<entry> <p>GB2312</p> </entry>
-<entry> <p>GBK, Simplified Chinese</p> </entry>
-</row>
-<row>
<entry>GB18030</entry>
<entry>National Standard, Chinese</entry>
</row>
<row>
-<entry>IBM864</entry>
-<entry>PC Arabic (encoding not supported by the Page Designer Design page.
-)</entry>
-</row>
-<row>
<entry> <p>ISO-2022-JP</p> </entry>
<entry> <p>ISO 2022, Japanese</p> </entry>
</row>
@@ -89,12 +81,8 @@
<entry>Greek</entry>
</row>
<row>
-<entry> <p>ISO-8859-8-I</p> </entry>
-<entry> <p>Hebrew (Logical)</p> </entry>
-</row>
-<row>
<entry> <p>ISO-8859-8</p> </entry>
-<entry> <p>Hebrew (Visual)(encoding supported, but not supported by the Page
+<entry> <p>Hebrew (Visual) (encoding supported, but not supported by the Page
Designer Design page)</p> </entry>
</row>
<row>
@@ -130,13 +118,8 @@
<entry> <p>Unicode LittleEndian</p> </entry>
</row>
<row>
-<entry>WINDOWS-874</entry>
-<entry>Thai, <tm tmclass="special" tmowner="Microsoft Corporation" tmtype="reg"
-trademark="Microsoft">Microsoft</tm></entry>
-</row>
-<row>
-<entry> <p>WINDOWS-1252</p> </entry>
-<entry> <p>ISO Latin-1</p> </entry>
+<entry colname="COLSPEC0"><p>WINDOWS-31J<?Pub Caret?></p></entry>
+<entry colname="COLSPEC1"><p>Japanese, Windows-31J</p></entry>
</row>
<row>
<entry> <p>WINDOWS-1255</p> </entry>
@@ -146,17 +129,9 @@
<entry> <p>WINDOWS-1256</p> </entry>
<entry> <p>Arabic</p> </entry>
</row>
-<row>
-<entry>X-EUC-JP</entry>
-<entry>EUC encoding, Japanese (alias for EUC-JP)</entry>
-</row>
-<row>
-<entry>X-SJIS</entry>
-<entry>Shift-JIS, Japanese (alias for SHIFT_JIS)</entry>
-</row>
</tbody>
</tgroup>
</table>
</conbody>
</concept>
-<?Pub *0000003991?>
+<?Pub *0000003415?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
index 26b1018..f58ec34 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="XML and HTML encodings" />
<meta name="abstract" content="Encodings enable you to specify what character encoding your text is in." />
<meta name="description" content="Encodings enable you to specify what character encoding your text is in." />
-<meta content="Encodings, HTML, XML" name="DC.subject" />
-<meta content="Encodings, HTML, XML" name="keywords" />
+<meta content="character encoding, text in files, encodings, supported character sets" name="DC.subject" />
+<meta content="character encoding, text in files, encodings, supported character sets" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="cxmlenc" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -39,10 +39,10 @@
<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
<thead align="left">
<tr>
-<th valign="top" class="firstcol" id="N1007B"> <p><strong>XML Encoding (IANA Name)</strong></p>
+<th valign="top" class="firstcol" id="N1007C"> <p><strong>XML Encoding (IANA Name)</strong></p>
</th>
-<th valign="top" id="N1008D"> <p><strong>Description</strong></p>
+<th valign="top" id="N1008E"> <p><strong>Description</strong></p>
</th>
</tr>
@@ -51,262 +51,215 @@
<tbody>
<tr>
-<th valign="top" class="firstcol" id="N100AB" headers="N1007B "> <p>BIG5</p>
+<th valign="top" class="firstcol" id="N100AC" headers="N1007C "> <p>BIG5</p>
</th>
-<td valign="top" headers="N100AB N1008D "> <p>Big5, Traditional Chinese</p>
+<td valign="top" headers="N100AC N1008E "> <p>Big5, Traditional Chinese</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N100CB" headers="N1007B "> <p>EUC-JP</p>
+<th valign="top" class="firstcol" id="N100CC" headers="N1007C "> <p>EUC-JP</p>
</th>
-<td valign="top" headers="N100CB N1008D "> <p>EUC encoding, Japanese</p>
+<td valign="top" headers="N100CC N1008E "> <p>EUC encoding, Japanese</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N100EB" headers="N1007B "> <p>EUC-KR</p>
+<th valign="top" class="firstcol" id="N100EC" headers="N1007C "> <p>EUC-KR</p>
</th>
-<td valign="top" headers="N100EB N1008D "> <p>EUC encoding, Korean</p>
+<td valign="top" headers="N100EC N1008E "> <p>EUC encoding, Korean</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1010B" headers="N1007B "> <p>GB2312</p>
+<th valign="top" class="firstcol" id="N1010C" headers="N1007C ">GB18030</th>
+
+<td valign="top" headers="N1010C N1008E ">National Standard, Chinese</td>
+
+</tr>
+
+<tr>
+<th valign="top" class="firstcol" id="N10120" headers="N1007C "> <p>ISO-2022-JP</p>
</th>
-<td valign="top" headers="N1010B N1008D "> <p>GBK, Simplified Chinese</p>
+<td valign="top" headers="N10120 N1008E "> <p>ISO 2022, Japanese</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1012B" headers="N1007B ">GB18030</th>
-
-<td valign="top" headers="N1012B N1008D ">National Standard, Chinese</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1013F" headers="N1007B ">IBM864</th>
-
-<td valign="top" headers="N1013F N1008D ">PC Arabic (encoding not supported by the Page Designer Design page.
-)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10153" headers="N1007B "> <p>ISO-2022-JP</p>
+<th valign="top" class="firstcol" id="N10140" headers="N1007C "> <p>ISO-2022-KR</p>
</th>
-<td valign="top" headers="N10153 N1008D "> <p>ISO 2022, Japanese</p>
+<td valign="top" headers="N10140 N1008E "> <p>ISO 2022, Korean</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N10173" headers="N1007B "> <p>ISO-2022-KR</p>
+<th valign="top" class="firstcol" id="N10160" headers="N1007C "> <p>ISO-8859-1</p>
</th>
-<td valign="top" headers="N10173 N1008D "> <p>ISO 2022, Korean</p>
+<td valign="top" headers="N10160 N1008E "> <p>ISO Latin-1</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N10193" headers="N1007B "> <p>ISO-8859-1</p>
+<th valign="top" class="firstcol" id="N10180" headers="N1007C ">ISO-8859-2</th>
+
+<td valign="top" headers="N10180 N1008E ">Central/East European (Slavic)</td>
+
+</tr>
+
+<tr>
+<th valign="top" class="firstcol" id="N10194" headers="N1007C ">ISO-8859-3</th>
+
+<td valign="top" headers="N10194 N1008E ">Southern European</td>
+
+</tr>
+
+<tr>
+<th valign="top" class="firstcol" id="N101A8" headers="N1007C ">ISO-8859-4</th>
+
+<td valign="top" headers="N101A8 N1008E ">ISO 8859-4, Cyrillic</td>
+
+</tr>
+
+<tr>
+<th valign="top" class="firstcol" id="N101BC" headers="N1007C ">ISO-8859-5</th>
+
+<td valign="top" headers="N101BC N1008E ">ISO 8859-5, Cyrillic</td>
+
+</tr>
+
+<tr>
+<th valign="top" class="firstcol" id="N101D0" headers="N1007C "> <p>ISO-8859-6</p>
</th>
-<td valign="top" headers="N10193 N1008D "> <p>ISO Latin-1</p>
+<td valign="top" headers="N101D0 N1008E "> <p>Arabic (Logical)</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N101B3" headers="N1007B ">ISO-8859-2</th>
+<th valign="top" class="firstcol" id="N101F0" headers="N1007C ">ISO-8859-7</th>
-<td valign="top" headers="N101B3 N1008D ">Central/East European (Slavic)</td>
+<td valign="top" headers="N101F0 N1008E ">Greek</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N101C7" headers="N1007B ">ISO-8859-3</th>
-
-<td valign="top" headers="N101C7 N1008D ">Southern European</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101DB" headers="N1007B ">ISO-8859-4</th>
-
-<td valign="top" headers="N101DB N1008D ">ISO 8859-4, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101EF" headers="N1007B ">ISO-8859-5</th>
-
-<td valign="top" headers="N101EF N1008D ">ISO 8859-5, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10203" headers="N1007B "> <p>ISO-8859-6</p>
+<th valign="top" class="firstcol" id="N10204" headers="N1007C "> <p>ISO-8859-8</p>
</th>
-<td valign="top" headers="N10203 N1008D "> <p>Arabic (Logical)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10223" headers="N1007B ">ISO-8859-7</th>
-
-<td valign="top" headers="N10223 N1008D ">Greek</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10237" headers="N1007B "> <p>ISO-8859-8-I</p>
- </th>
-
-<td valign="top" headers="N10237 N1008D "> <p>Hebrew (Logical)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10257" headers="N1007B "> <p>ISO-8859-8</p>
- </th>
-
-<td valign="top" headers="N10257 N1008D "> <p>Hebrew (Visual)(encoding supported, but not supported by the Page
+<td valign="top" headers="N10204 N1008E "> <p>Hebrew (Visual) (encoding supported, but not supported by the Page
Designer Design page)</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N10277" headers="N1007B ">ISO-8859-9</th>
+<th valign="top" class="firstcol" id="N10224" headers="N1007C ">ISO-8859-9</th>
-<td valign="top" headers="N10277 N1008D ">Turkish</td>
+<td valign="top" headers="N10224 N1008E ">Turkish</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1028B" headers="N1007B "> <p>SHIFT_JIS</p>
+<th valign="top" class="firstcol" id="N10238" headers="N1007C "> <p>SHIFT_JIS</p>
</th>
-<td valign="top" headers="N1028B N1008D "> <p>Shift-JIS, Japanese</p>
+<td valign="top" headers="N10238 N1008E "> <p>Shift-JIS, Japanese</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N102AB" headers="N1007B ">TIS-620</th>
+<th valign="top" class="firstcol" id="N10258" headers="N1007C ">TIS-620</th>
-<td valign="top" headers="N102AB N1008D ">TISI, Thai</td>
+<td valign="top" headers="N10258 N1008E ">TISI, Thai</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N102BF" headers="N1007B "> <p>US-ASCII</p>
+<th valign="top" class="firstcol" id="N1026C" headers="N1007C "> <p>US-ASCII</p>
</th>
-<td valign="top" headers="N102BF N1008D "> <p>US ASCII</p>
+<td valign="top" headers="N1026C N1008E "> <p>US ASCII</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N102DF" headers="N1007B "> <p>UTF-8</p>
+<th valign="top" class="firstcol" id="N1028C" headers="N1007C "> <p>UTF-8</p>
</th>
-<td valign="top" headers="N102DF N1008D "> <p>ISO 10646/Unicode, one-byte encoding</p>
+<td valign="top" headers="N1028C N1008E "> <p>ISO 10646/Unicode, one-byte encoding</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N102FF" headers="N1007B "> <p>UTF-16</p>
+<th valign="top" class="firstcol" id="N102AC" headers="N1007C "> <p>UTF-16</p>
</th>
-<td valign="top" headers="N102FF N1008D "> <p>ISO 10646/Unicode, two-byte encoding</p>
+<td valign="top" headers="N102AC N1008E "> <p>ISO 10646/Unicode, two-byte encoding</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1031F" headers="N1007B "> <p>UTF-16BE</p>
+<th valign="top" class="firstcol" id="N102CC" headers="N1007C "> <p>UTF-16BE</p>
</th>
-<td valign="top" headers="N1031F N1008D "> <p>Unicode BigEndian</p>
+<td valign="top" headers="N102CC N1008E "> <p>Unicode BigEndian</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1033F" headers="N1007B "> <p>UTF-16LE</p>
+<th valign="top" class="firstcol" id="N102EC" headers="N1007C "> <p>UTF-16LE</p>
</th>
-<td valign="top" headers="N1033F N1008D "> <p>Unicode LittleEndian</p>
+<td valign="top" headers="N102EC N1008E "> <p>Unicode LittleEndian</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1035F" headers="N1007B ">WINDOWS-874</th>
+<th valign="top" class="firstcol" id="N1030C" headers="N1007C "><p>WINDOWS-31J</p>
+</th>
-<td valign="top" headers="N1035F N1008D ">Thai, Microsoft<sup>®</sup></td>
+<td valign="top" headers="N1030C N1008E "><p>Japanese, Windows-31J</p>
+</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1037C" headers="N1007B "> <p>WINDOWS-1252</p>
+<th valign="top" class="firstcol" id="N10328" headers="N1007C "> <p>WINDOWS-1255</p>
</th>
-<td valign="top" headers="N1037C N1008D "> <p>ISO Latin-1</p>
+<td valign="top" headers="N10328 N1008E "> <p>Hebrew</p>
</td>
</tr>
<tr>
-<th valign="top" class="firstcol" id="N1039C" headers="N1007B "> <p>WINDOWS-1255</p>
+<th valign="top" class="firstcol" id="N10348" headers="N1007C "> <p>WINDOWS-1256</p>
</th>
-<td valign="top" headers="N1039C N1008D "> <p>Hebrew</p>
+<td valign="top" headers="N10348 N1008E "> <p>Arabic</p>
</td>
</tr>
-<tr>
-<th valign="top" class="firstcol" id="N103BC" headers="N1007B "> <p>WINDOWS-1256</p>
- </th>
-
-<td valign="top" headers="N103BC N1008D "> <p>Arabic</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N103DC" headers="N1007B ">X-EUC-JP</th>
-
-<td valign="top" headers="N103DC N1008D ">EUC encoding, Japanese (alias for EUC-JP)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N103F0" headers="N1007B ">X-SJIS</th>
-
-<td valign="top" headers="N103F0 N1008D ">Shift-JIS, Japanese (alias for SHIFT_JIS)</td>
-
-</tr>
-
</tbody>
</table>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
index ee9086b..0b7ff5b 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
index dfece6a..e9b23f5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
index 50087a8..660543a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
index ad0b19e..d7c76ab 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
@@ -2,6 +2,7 @@
<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Inc?>
<task id="tcretxml" xml:lang="en-us">
<title>Creating XML files</title>
<titlealts>
@@ -17,23 +18,26 @@
<taskbody>
<context><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p><p>To create a new
-XML file, follow these instructions:</p></context>
+XML file, complete the following steps:</p></context>
<steps>
-<step><cmd>If necessary, create a project to contain the XML file.</cmd></step>
+<step><cmd>Create a project to contain the XML file if one does not exist
+already.</cmd></step>
<step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol><uicontrol>XML</uicontrol>
-<uicontrol>XML</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
+<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade> and select <menucascade>
+<uicontrol>XML</uicontrol><uicontrol>XML</uicontrol></menucascade>. Click <uicontrol>Next</uicontrol>.</cmd>
</step>
<step><cmd>Select the project or folder that will contain the XML file.</cmd>
</step>
<step><cmd>In the <uicontrol>File name</uicontrol> field, type the name of
-the XML file, for example <userinput>MyXMLFile.xml</userinput>. The name of
-your XML file <varname>must</varname> end in <userinput>.xml</userinput>.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Next.</uicontrol></cmd></step>
-<step><cmd>Click the <uicontrol>Create XML file from an XML template</uicontrol> radio
-button.</cmd></step>
+the XML file and click <uicontrol>Next</uicontrol>. The name of your XML file
+must end in <userinput>.xml</userinput>.</cmd></step>
+<step><cmd>Select the <uicontrol>Create XML file from an XML template</uicontrol> radio
+button and click <uicontrol>Next.</uicontrol>.</cmd></step>
+<step importance="optional"><cmd>You may choose to view and edit the XML templates
+that will be used in your new XML file.</cmd></step>
<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
</steps>
+<postreq><?Pub Caret?></postreq>
</taskbody>
</task>
+<?Pub *0000002004?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
index 63438a9..72d3089 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -38,34 +38,37 @@
<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To create a new
-XML file, follow these instructions:</p>
+XML file, complete the following steps:</p>
</div>
<ol>
-<li><span>If necessary, create a project to contain the XML file.</span></li>
+<li><span>Create a project to contain the XML file if one does not exist
+already.</span></li>
<li><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">XML</span>
- > <span class="uicontrol">XML</span></span> and click <span class="uicontrol">Next</span>.</span>
+ > <span class="uicontrol">New</span> > <span class="uicontrol">Other</span></span> and select <span class="menucascade">
+<span class="uicontrol">XML</span> > <span class="uicontrol">XML</span></span>. Click <span class="uicontrol">Next</span>.</span>
</li>
<li><span>Select the project or folder that will contain the XML file.</span>
</li>
<li><span>In the <span class="uicontrol">File name</span> field, type the name of
-the XML file, for example <kbd class="userinput">MyXMLFile.xml</kbd>. The name of
-your XML file <var class="varname">must</var> end in <kbd class="userinput">.xml</kbd>.</span>
-</li>
+the XML file and click <span class="uicontrol">Next</span>. The name of your XML file
+must end in <kbd class="userinput">.xml</kbd>.</span></li>
-<li><span>Click <span class="uicontrol">Next.</span></span></li>
+<li><span>Select the <span class="uicontrol">Create XML file from an XML template</span> radio
+button and click <span class="uicontrol">Next.</span>.</span></li>
-<li><span>Click the <span class="uicontrol">Create XML file from an XML template</span> radio
-button.</span></li>
+<li><strong>Optional: </strong><span>You may choose to view and edit the XML templates
+that will be used in your new XML file.</span></li>
<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
</ol>
+<div class="section" />
+
</div>
<div><div class="relconcepts"><strong>Related concepts</strong><br />
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
index fe8a065..16864ce 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tcrexdtd" xml:lang="en-us">
<title>Generating XML files from DTDs</title>
<titlealts>
@@ -13,40 +14,38 @@
DTD.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML files<indexterm>generating from DTDs</indexterm></indexterm>
-<indexterm>DTD<indexterm>generating XML files</indexterm></indexterm>
-</keywords>
+<indexterm>DTD<indexterm>generating XML files</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context><p>After you have generated your XML file, you can further customize
it in the XML editor.</p><p>The following instructions were written for the
Resource perspective, but they will also work in many other perspectives.</p><p>To
-create an XML file from a DTD file follow these steps:</p></context>
+create an XML file from a DTD file, complete the following steps:</p></context>
<steps>
<step><cmd>In the Navigator view, right-click the DTD file that you want to
-work with.</cmd></step>
-<step><cmd>From its pop-up menu click <menucascade><uicontrol>Generate</uicontrol>
-<uicontrol>XML File</uicontrol></menucascade>.</cmd></step>
+work with and select <menucascade><uicontrol>Generate</uicontrol><uicontrol>XML
+File</uicontrol></menucascade>.</cmd></step>
<step><cmd>Select a project or folder to contain the XML file and type a name
-for it.</cmd><info>The name of the file must end in <userinput>.xml</userinput>.</info>
+for the file in the <uicontrol>File Name</uicontrol> field, then click <uicontrol>Next</uicontrol>.</cmd>
+<info>The name of the file must end in <userinput>.xml</userinput>.</info>
</step>
-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>
<step><cmd>Select the <uicontrol>Root element</uicontrol> of the XML file.</cmd>
<info>The root element of an XML file is the element that contains all other
elements in that file. All the elements that you have defined in the DTD will
be shown in the <uicontrol>Root element</uicontrol> list.</info></step>
<step><cmd>Select from the following content options: </cmd>
<choices>
-<choice><uicontrol>Create optional attributes</uicontrol>. Both mandatory
+<choice><uicontrol>Create optional attributes</uicontrol>: both mandatory
and optional attributes will be generated.</choice>
-<choice><uicontrol>Create optional elements</uicontrol>. Both mandatory and
+<choice><uicontrol>Create optional elements</uicontrol>: both mandatory and
optional elements will be generated.</choice>
-<choice><uicontrol>Create first choice of required choice</uicontrol>. The
+<choice><uicontrol>Create first choice of required choice</uicontrol>: the
first option of a required choice will be generated in your XML file.</choice>
-<choice><uicontrol>Fill elements and attributes with data</uicontrol>. Any
-elements and attributes generated will be filled with sample data.</choice>
+<choice><uicontrol>Fill elements and attributes with data</uicontrol>:<?Pub Caret?>
+any elements and attributes generated will be filled with sample data.</choice>
</choices>
-<info> <p>If you do not select any of these options, then only the minimum
-amount of content required for the XML file will be created.</p></info></step>
+<info> If you do not select any of these options, then only the minimum amount
+of content required for the XML file will be created.</info></step>
<step><cmd>Specify the <uicontrol>Public ID</uicontrol> or <uicontrol>System
ID</uicontrol>.</cmd><info>You do not need to specify both. If you do, the
Public ID will be used before the System ID. </info></step>
@@ -58,4 +57,4 @@
the rules established in the DTD that you used to create the XML file.</p></result>
</taskbody>
</task>
-<?Pub *0000003334?>
+<?Pub *0000003391?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
index f4c76ce..29d6b7b 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Generating XML files from DTDs" />
<meta name="abstract" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
<meta name="description" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta content="XML files, generating from DTDs" name="DC.subject" />
-<meta content="XML files, generating from DTDs" name="keywords" />
+<meta content="XML files, generating from DTDs, DTD, generating XML files" name="DC.subject" />
+<meta content="XML files, generating from DTDs, DTD, generating XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
@@ -42,22 +42,19 @@
<p>The following instructions were written for the
Resource perspective, but they will also work in many other perspectives.</p>
<p>To
-create an XML file from a DTD file follow these steps:</p>
+create an XML file from a DTD file, complete the following steps:</p>
</div>
<ol>
<li class="stepexpand"><span>In the Navigator view, right-click the DTD file that you want to
-work with.</span></li>
-
-<li class="stepexpand"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span>
- > <span class="uicontrol">XML File</span></span>.</span></li>
+work with and select <span class="menucascade"><span class="uicontrol">Generate</span> > <span class="uicontrol">XML
+File</span></span>.</span></li>
<li class="stepexpand"><span>Select a project or folder to contain the XML file and type a name
-for it.</span> The name of the file must end in <kbd class="userinput">.xml</kbd>.
+for the file in the <span class="uicontrol">File Name</span> field, then click <span class="uicontrol">Next</span>.</span>
+ The name of the file must end in <kbd class="userinput">.xml</kbd>.
</li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
<li class="stepexpand"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span>
The root element of an XML file is the element that contains all other
elements in that file. All the elements that you have defined in the DTD will
@@ -65,23 +62,22 @@
<li class="stepexpand"><span>Select from the following content options: </span>
<ul>
-<li><span class="uicontrol">Create optional attributes</span>. Both mandatory
+<li><span class="uicontrol">Create optional attributes</span>: both mandatory
and optional attributes will be generated.</li>
-<li><span class="uicontrol">Create optional elements</span>. Both mandatory and
+<li><span class="uicontrol">Create optional elements</span>: both mandatory and
optional elements will be generated.</li>
-<li><span class="uicontrol">Create first choice of required choice</span>. The
+<li><span class="uicontrol">Create first choice of required choice</span>: the
first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span>. Any
-elements and attributes generated will be filled with sample data.</li>
+<li><span class="uicontrol">Fill elements and attributes with data</span>:
+any elements and attributes generated will be filled with sample data.</li>
</ul>
- <p>If you do not select any of these options, then only the minimum
-amount of content required for the XML file will be created.</p>
-</li>
+ If you do not select any of these options, then only the minimum amount
+of content required for the XML file will be created.</li>
<li class="stepexpand"><span>Specify the <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
ID</span>.</span> You do not need to specify both. If you do, the
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
index 20df2b6..afb257c 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<?Pub Inc?>
<task id="tcrexxsd" xml:lang="en-us">
<title>Generating XML files from XML schemas</title>
@@ -24,13 +25,13 @@
generate an XML file from a schema file follow these steps:</p></context>
<steps>
<step><cmd>In the Navigator view, right-click the XML schema file that you
-want to work with.</cmd></step>
-<step><cmd>From its pop-up menu click <menucascade><uicontrol>Generate</uicontrol>
+want to work with and select <menucascade><uicontrol>Generate</uicontrol>
<uicontrol>XML File</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Select a project or folder to contain the XML file, type a name
-for it and click <uicontrol>Next</uicontrol>.</cmd><info>The name of the file
-must end in<systemoutput>.xml.</systemoutput> </info></step>
-<step><cmd>Click the <uicontrol>Root element</uicontrol> of the XML file.</cmd>
+<step><cmd>Select a project or folder to contain the XML file and type a name
+for the file in the <uicontrol>File Name</uicontrol> field, then click <uicontrol>Next</uicontrol>.</cmd>
+<info>The name of the file must end in <userinput>.xml</userinput>.</info>
+</step>
+<step><cmd>Select the <uicontrol>Root element</uicontrol> of the XML file.</cmd>
<info>The root element of an XML file is the element that contains all other
elements in that file. All of the global elements you have defined in the
XML schema will be included in the Root element list. If you do not have any
@@ -38,48 +39,45 @@
</step>
<step><cmd>Select from the following content options:</cmd>
<choices>
-<choice><uicontrol>Create optional attributes</uicontrol>. Both mandatory
+<choice><uicontrol>Create optional attributes</uicontrol>: both mandatory
and optional attributes will be generated.</choice>
-<choice><uicontrol>Create optional elements</uicontrol>. Both mandatory and
+<choice><uicontrol>Create optional elements</uicontrol>: both mandatory and
optional elements will be generated.</choice>
-<choice><uicontrol>Create first choice of required choice</uicontrol>. The
+<choice><uicontrol>Create first choice of required choice</uicontrol>: the
first option of a required choice will be generated in your XML file.</choice>
-<choice><uicontrol>Fill elements and attributes with data</uicontrol>. Any
+<choice><uicontrol>Fill elements and attributes with data</uicontrol>: any
elements and attributes generated will be filled with sample data.</choice>
</choices>
<info>If you do not select any of these options, then only the minimum amount
of content required for the XML file will be created.</info></step>
-<step><cmd>The Namespace information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location.</cmd>
-<info>For more information about namespaces and namespace prefixes, refer
-to the related references.</info></step>
-<step><cmd>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</cmd>
-</step>
-<step><cmd>The value in the <uicontrol>Namespace Name</uicontrol> field is
-the target namespace of the XML schema.</cmd><info>Your XML file should be
-associated with the same namespace as its XML schema is associated with.</info>
-</step>
-<step><cmd>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>
-</step>
-<step><cmd>The <uicontrol>Location Hint</uicontrol> field contains the location
-of the XML schema.</cmd></step>
-<step><cmd>Click <uicontrol>OK</uicontrol>, then <uicontrol>Finish</uicontrol>.</cmd>
+<step><cmd>The Namespace Information section contains information about the
+target namespace of the XML schema, its prefix, and the schema location. Select
+the entry you want to edit and click <uicontrol>Edit</uicontrol>.</cmd><info><ul>
+<li>The value in the <uicontrol>Namespace Name</uicontrol> field is the target
+namespace of the XML schema. Your XML file should be associated with the same
+namespace as its XML schema is associated with.</li>
+<li>All qualified elements and attributes in the XML file associated with
+the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</li>
+<li>The <uicontrol>Location Hint</uicontrol> field contains the location
+of the XML schema.</li>
+</ul>For more information about namespaces and namespace prefixes, refer to
+the related references.</info></step>
+<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Finish</uicontrol>.</cmd>
</step>
</steps>
<result><p>The XML file will contain the selected root element and any elements
or attributes contained in the root element. It also contains information
about the XML file namespace and location. You can now add elements and attributes
-to the XML file.</p><p><b>Note:</b> In certain cases, when an XML file is
-generated from a complex XML schema file, the XML file might not be valid.
-If this occurs, you can open the generated file in the XML editor and correct
-any errors that occur. Usually, only a few errors need to be fixed. The following
-XML schema constructs might present problems:</p><ol>
-<li>Restrictions. Sometimes restricted elements are erroneously generated. </li>
-<li>Facets: Default generated data values might not conform to complex facets
+to the XML file.</p><note>In certain cases, when an XML file is generated
+from a complex XML schema file, the XML file might not be valid. If this occurs,
+you can open the generated file in the XML editor and correct any errors that
+occur. Usually, only a few errors need to be fixed. The following XML schema
+constructs might present problems:</note><ul><?Pub Caret?>
+<li>Restrictions: sometimes restricted elements are erroneously generated. </li>
+<li>Facets: default generated data values might not conform to complex facets
(for example, patterns).</li>
-<li>Abstract elements. abstract elements are sometimes erroneously generated.</li>
-</ol></result>
+<li>Abstract elements: abstract elements are sometimes erroneously generated.</li>
+</ul></result>
</taskbody>
</task>
-<?Pub *0000004757?>
+<?Pub *0000004762?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
index 0d32765..27134c5 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Generating XML files from XML schemas" />
<meta name="abstract" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
<meta name="description" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta content="XML files, generating from XML schemas" name="DC.subject" />
-<meta content="XML files, generating from XML schemas" name="keywords" />
+<meta content="XML files, generating from XML schemas, XML schemas, generating XML files" name="DC.subject" />
+<meta content="XML files, generating from XML schemas, XML schemas, generating XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
@@ -48,16 +48,15 @@
<ol>
<li class="stepexpand"><span>In the Navigator view, right-click the XML schema file that you
-want to work with.</span></li>
-
-<li class="stepexpand"><span>From its pop-up menu click <span class="menucascade"><span class="uicontrol">Generate</span>
+want to work with and select <span class="menucascade"><span class="uicontrol">Generate</span>
> <span class="uicontrol">XML File</span></span>.</span></li>
-<li class="stepexpand"><span>Select a project or folder to contain the XML file, type a name
-for it and click <span class="uicontrol">Next</span>.</span> The name of the file
-must end in<tt class="sysout">.xml.</tt> </li>
+<li class="stepexpand"><span>Select a project or folder to contain the XML file and type a name
+for the file in the <span class="uicontrol">File Name</span> field, then click <span class="uicontrol">Next</span>.</span>
+ The name of the file must end in <kbd class="userinput">.xml</kbd>.
+</li>
-<li class="stepexpand"><span>Click the <span class="uicontrol">Root element</span> of the XML file.</span>
+<li class="stepexpand"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span>
The root element of an XML file is the element that contains all other
elements in that file. All of the global elements you have defined in the
XML schema will be included in the Root element list. If you do not have any
@@ -66,16 +65,16 @@
<li class="stepexpand"><span>Select from the following content options:</span>
<ul>
-<li><span class="uicontrol">Create optional attributes</span>. Both mandatory
+<li><span class="uicontrol">Create optional attributes</span>: both mandatory
and optional attributes will be generated.</li>
-<li><span class="uicontrol">Create optional elements</span>. Both mandatory and
+<li><span class="uicontrol">Create optional elements</span>: both mandatory and
optional elements will be generated.</li>
-<li><span class="uicontrol">Create first choice of required choice</span>. The
+<li><span class="uicontrol">Create first choice of required choice</span>: the
first option of a required choice will be generated in your XML file.</li>
-<li><span class="uicontrol">Fill elements and attributes with data</span>. Any
+<li><span class="uicontrol">Fill elements and attributes with data</span>: any
elements and attributes generated will be filled with sample data.</li>
</ul>
@@ -83,27 +82,24 @@
If you do not select any of these options, then only the minimum amount
of content required for the XML file will be created.</li>
-<li class="stepexpand"><span>The Namespace information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location.</span>
- For more information about namespaces and namespace prefixes, refer
-to the related references.</li>
+<li class="stepexpand"><span>The Namespace Information section contains information about the
+target namespace of the XML schema, its prefix, and the schema location. Select
+the entry you want to edit and click <span class="uicontrol">Edit</span>.</span> <ul>
+<li>The value in the <span class="uicontrol">Namespace Name</span> field is the target
+namespace of the XML schema. Your XML file should be associated with the same
+namespace as its XML schema is associated with.</li>
-<li class="stepexpand"><span>Select the entry you want to edit and click <span class="uicontrol">Edit</span>.</span>
-</li>
+<li>All qualified elements and attributes in the XML file associated with
+the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</li>
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
-the target namespace of the XML schema.</span> Your XML file should be
-associated with the same namespace as its XML schema is associated with.
-</li>
+<li>The <span class="uicontrol">Location Hint</span> field contains the location
+of the XML schema.</li>
-<li class="stepexpand"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</span>
-</li>
+</ul>
+For more information about namespaces and namespace prefixes, refer to
+the related references.</li>
-<li class="stepexpand"><span>The <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>, then <span class="uicontrol">Finish</span>.</span>
+<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> and then <span class="uicontrol">Finish</span>.</span>
</li>
</ol>
@@ -112,20 +108,20 @@
or attributes contained in the root element. It also contains information
about the XML file namespace and location. You can now add elements and attributes
to the XML file.</p>
-<p><strong>Note:</strong> In certain cases, when an XML file is
-generated from a complex XML schema file, the XML file might not be valid.
-If this occurs, you can open the generated file in the XML editor and correct
-any errors that occur. Usually, only a few errors need to be fixed. The following
-XML schema constructs might present problems:</p>
-<ol>
-<li>Restrictions. Sometimes restricted elements are erroneously generated. </li>
+<div class="note"><span class="notetitle">Note:</span> In certain cases, when an XML file is generated
+from a complex XML schema file, the XML file might not be valid. If this occurs,
+you can open the generated file in the XML editor and correct any errors that
+occur. Usually, only a few errors need to be fixed. The following XML schema
+constructs might present problems:</div>
+<ul>
+<li>Restrictions: sometimes restricted elements are erroneously generated. </li>
-<li>Facets: Default generated data values might not conform to complex facets
+<li>Facets: default generated data values might not conform to complex facets
(for example, patterns).</li>
-<li>Abstract elements. abstract elements are sometimes erroneously generated.</li>
+<li>Abstract elements: abstract elements are sometimes erroneously generated.</li>
-</ol>
+</ul>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
index 63f1b5c..c3d43ce 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tedtcnst" xml:lang="en-us">
<title>Editing with DTD or XML schema constraints</title>
<titlealts>
<searchtitle>Editing with DTD or XML schema constraints</searchtitle>
</titlealts>
<shortdesc>In the Design view, when you edit an XML file that has a set of
-constraints (that is, a set of rules) defined by a DTD or an XML schema, you
-can turn the constraints on and off to provide flexibility in the way you
-edit, but still maintain the validity of the document periodically.</shortdesc>
+constraints or rules defined by a DTD or an XML schema, you can turn the constraints
+on and off to provide flexibility in the way you edit, but still maintain
+the validity of the document periodically.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>editing with constraints</indexterm></indexterm>
<indexterm>XML files<indexterm>editing with constraints</indexterm></indexterm>
@@ -25,15 +26,14 @@
if you need more flexibility. For example, you want to try working with elements
or attributes not permitted by the associated DTD or XML schema, without actually
removing the association with the DTD or XML schema.</p><p>To turn the constraints
-for an XML file off, click <uicontrol>XML > Turn Grammar Constraints Off</uicontrol>.
-After you have turned the constraints off for a file, you can insert or delete
-any element or attribute regardless of the DTD or XML schema rules. You can
-create new elements or attributes that are not in the DTD or schema - these
-Design view prompts will only appear when you have turned constraints off.
-The file might not be valid, however, if you do this. </p><p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</p><p>The following example shows what you
-can do if you turn the constraints of a DTD off:</p></context>
+for an XML file off, click <menucascade><uicontrol>XML</uicontrol><uicontrol>Turn
+Grammar Constraints Off</uicontrol></menucascade> in the toolbar. After you
+have turned the constraints off for a file, you can insert or delete any element
+or attribute regardless of the DTD or XML schema rules. You can create new
+elements or attributes that are not in the DTD or schema - these Design view
+prompts will only appear when you have turned constraints off. The file might
+not be valid, however, if you do this. </p><p>The following example shows
+what you can do if you turn the constraints of a DTD off:</p></context>
<steps>
<step><cmd>Open the XML file in the XML editor (right-click the file in the
Navigator view and click <uicontrol>Open With > XML Editor</uicontrol>). </cmd>
@@ -53,10 +53,12 @@
<step><cmd>To correct the invalid document, you will have to re-add the necessary
element, or remove the invalid tagging or value.</cmd></step>
</steps>
-<result>If you introduce errors into your files, you must save and validate
-the file in order to see a list of the errors you have introduced. They will
-be listed in the Problems view. After you fix the errors, you must save and
-validate your file again to see if the file is now valid.</result>
+<result><?Pub Caret?><p>If you introduce errors into your files, you must
+save and validate the file in order to see a list of the errors you have introduced.
+They will be listed in the Problems view. After you fix the errors, you must
+save and validate your file again to see if the file is now valid.</p><p>These
+instructions were written for the Resource perspective, but they will also
+work in many other perspectives.</p></result>
</taskbody>
</task>
-<?Pub *0000003854?>
+<?Pub *0000003814?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
index ab8acd7..3574b49 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Editing with DTD or XML schema constraints" />
-<meta name="abstract" content="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta name="description" content="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta content="XML editor, editing, with DTD or XML schema constraints, XML files, with DTD or XML schema constraints" name="DC.subject" />
-<meta content="XML editor, editing, with DTD or XML schema constraints, XML files, with DTD or XML schema constraints" name="keywords" />
+<meta name="abstract" content="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
+<meta name="description" content="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
+<meta content="XML editor, editing with constraints, XML files" name="DC.subject" />
+<meta content="XML editor, editing with constraints, XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
@@ -36,9 +36,9 @@
<div><p>In the Design view, when you edit an XML file that has a set of
-constraints (that is, a set of rules) defined by a DTD or an XML schema, you
-can turn the constraints on and off to provide flexibility in the way you
-edit, but still maintain the validity of the document periodically.</p>
+constraints or rules defined by a DTD or an XML schema, you can turn the constraints
+on and off to provide flexibility in the way you edit, but still maintain
+the validity of the document periodically.</p>
<div class="section"><p> When the constraints are turned on, and you are working in the
Design view, the XML editor prevents you from inserting elements, attributes,
@@ -51,17 +51,15 @@
or attributes not permitted by the associated DTD or XML schema, without actually
removing the association with the DTD or XML schema.</p>
<p>To turn the constraints
-for an XML file off, click <span class="uicontrol">XML > Turn Grammar Constraints Off</span>.
-After you have turned the constraints off for a file, you can insert or delete
-any element or attribute regardless of the DTD or XML schema rules. You can
-create new elements or attributes that are not in the DTD or schema - these
-Design view prompts will only appear when you have turned constraints off.
-The file might not be valid, however, if you do this. </p>
-<p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</p>
-<p>The following example shows what you
-can do if you turn the constraints of a DTD off:</p>
+for an XML file off, click <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">Turn
+Grammar Constraints Off</span></span> in the toolbar. After you
+have turned the constraints off for a file, you can insert or delete any element
+or attribute regardless of the DTD or XML schema rules. You can create new
+elements or attributes that are not in the DTD or schema - these Design view
+prompts will only appear when you have turned constraints off. The file might
+not be valid, however, if you do this. </p>
+<p>The following example shows
+what you can do if you turn the constraints of a DTD off:</p>
</div>
<ol>
@@ -91,10 +89,14 @@
</ol>
-<div class="section">If you introduce errors into your files, you must save and validate
-the file in order to see a list of the errors you have introduced. They will
-be listed in the Problems view. After you fix the errors, you must save and
-validate your file again to see if the file is now valid.</div>
+<div class="section"><p>If you introduce errors into your files, you must
+save and validate the file in order to see a list of the errors you have introduced.
+They will be listed in the Problems view. After you fix the errors, you must
+save and validate your file again to see if the file is now valid.</p>
+<p>These
+instructions were written for the Resource perspective, but they will also
+work in many other perspectives.</p>
+</div>
</div>
@@ -103,7 +105,7 @@
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
index 5f5a682..9249ccf 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tedtdoc" xml:lang="en-us">
<title>Editing DOCTYPE declarations</title>
<titlealts>
@@ -17,24 +18,25 @@
<taskbody>
<context><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p><p>To edit your DOCTYPE
-declaration, follow these steps:</p></context>
+declaration, complete the following steps:</p></context>
<steps>
<step><cmd>In the Design view of the XML editor, right-click <uicontrol>DOCTYPE</uicontrol> and
click <uicontrol>Edit DOCTYPE</uicontrol>.</cmd></step>
-<step><cmd>The value in the <uicontrol>Root element name</uicontrol> field
+<step><cmd>The <?Pub Caret?>value in the <uicontrol>Root element name</uicontrol> field
should match the root element of your XML file exactly.</cmd><info>You should
only edit the value in this field if your root element changes.</info></step>
<step><cmd>You can select a Public ID for any existing XML Catalog entries
by clicking <uicontrol>Browse</uicontrol>. </cmd><info>The value in the <uicontrol>Public
ID</uicontrol> field is the Public Identifier. It is used to associate the
-XML file (using an XML Catalog entry) with a DTD file. For more information
-on XML Catalog entries, refer to the related tasks.</info></step>
+XML file (using an XML Catalog entry) with a DTD file. For more information,
+see <xref format="html" href="txmlcat.dita" scope="peer">Adding entries to
+the XML Catalog</xref>.</info></step>
<step><cmd>The value in the <uicontrol>System ID</uicontrol> field is the
DTD the XML file is associated with. Type the path of the DTD file (or browse
-for it) you want the XML file associated with in this field. </cmd><info> <b>Note</b>:
-When the XML file is processed by the XML processor, it will first try to
-use the Public ID to locate the DTD, and if this fails, it will use the System
-ID to find it.</info></step>
+for it) you want the XML file associated with in this field. </cmd><info> <note>When
+the XML file is processed by the XML processor, it will first try to use the
+Public ID to locate the DTD, and if this fails, it will use the System ID
+to find it.</note></info></step>
<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
</steps>
<postreq>If you do not have a DOCTYPE declaration in your XML file, you can
@@ -42,3 +44,4 @@
add one.</postreq>
</taskbody>
</task>
+<?Pub *0000002518?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
index 4d877a3..ea28494 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Editing DOCTYPE declarations" />
<meta name="abstract" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
<meta name="description" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
-<meta content="XML editor, editing, DOCTYPE declarations, XML files" name="DC.subject" />
-<meta content="XML editor, editing, DOCTYPE declarations, XML files" name="keywords" />
+<meta content="DOCTYPE declarations, XML editor" name="DC.subject" />
+<meta content="DOCTYPE declarations, XML editor" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
@@ -39,7 +39,7 @@
<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To edit your DOCTYPE
-declaration, follow these steps:</p>
+declaration, complete the following steps:</p>
</div>
<ol>
@@ -53,15 +53,16 @@
<li class="stepexpand"><span>You can select a Public ID for any existing XML Catalog entries
by clicking <span class="uicontrol">Browse</span>. </span> The value in the <span class="uicontrol">Public
ID</span> field is the Public Identifier. It is used to associate the
-XML file (using an XML Catalog entry) with a DTD file. For more information
-on XML Catalog entries, refer to the related tasks.</li>
+XML file (using an XML Catalog entry) with a DTD file. For more information,
+see <a href="txmlcat.dita">Adding entries to the XML Catalog</a>.</li>
<li class="stepexpand"><span>The value in the <span class="uicontrol">System ID</span> field is the
DTD the XML file is associated with. Type the path of the DTD file (or browse
-for it) you want the XML file associated with in this field. </span> <strong>Note</strong>:
-When the XML file is processed by the XML processor, it will first try to
-use the Public ID to locate the DTD, and if this fails, it will use the System
-ID to find it.</li>
+for it) you want the XML file associated with in this field. </span> <div class="note"><span class="notetitle">Note:</span> When
+the XML file is processed by the XML processor, it will first try to use the
+Public ID to locate the DTD, and if this fails, it will use the System ID
+to find it.</div>
+</li>
<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
@@ -77,8 +78,8 @@
<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
+<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
index 92ec6ed..acbee1d 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
<task id="tedtenc" xml:lang="en-us">
<title>Specifying XML default encoding line delimiters</title>
<titlealts>
@@ -10,27 +12,29 @@
that will be used when you create or save an XML related file.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML files<indexterm>specifying line delimiters</indexterm></indexterm>
-<indexterm>line delimiters<indexterm>XML files</indexterm></indexterm>
-</keywords>
+<indexterm>line delimiters<indexterm>XML files</indexterm></indexterm></keywords>
<keywords></keywords>
</metadata></prolog>
<taskbody>
-<context><p>To specify the line delimiter you want to use:</p></context>
+<context><p>To specify the line delimiter you want to use, complete the following
+steps:</p></context>
<steps>
<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Line delimiter</uicontrol> list, select the operating
-system that applies to your development or deployment platform. </cmd></step>
-<step><cmd>From the <uicontrol>Encoding</uicontrol> field, specify
-the default character encoding set that is used when creating XML related
-files (DTDs, XML files, XML schemas). Changing the encoding causes any new,
-XML related files that are created from scratch to use the selected encoding.</cmd>
-</step>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files</uicontrol></menucascade>.</cmd></step>
+<step><cmd>From the <uicontrol>Encoding</uicontrol> field, specify the default
+character encoding set that is used when creating XML related files (DTDs,
+XML files, XML schemas). Changing the encoding causes any new, XML related
+files that are created from scratch to use the selected encoding.</cmd></step>
+<step><cmd>Select <menucascade><uicontrol>General</uicontrol><uicontrol>Workspace</uicontrol>
+</menucascade> in the left pane of the Preferences window and chose either <uicontrol>Default</uicontrol> or <uicontrol>Other</uicontrol> in
+the <uicontrol>New text file line delimiter </uicontrol>section. Select the
+operating system that applies to your development or deployment platform from
+the <uicontrol>Other</uicontrol> drop down list.</cmd></step><?Pub Caret?>
<step><cmd>Click <uicontrol>Apply</uicontrol>, then <uicontrol>OK</uicontrol>.</cmd>
</step>
</steps>
<result></result>
</taskbody>
</task>
-<?Pub *0000001698?>
+<?Pub *0000002002?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
index 4f0cfd7..39a6c98 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Specifying XML default encoding line delimiters" />
<meta name="abstract" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
<meta name="description" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
-<meta content="XML files, specifying, line delimiters, encoding" name="DC.subject" />
-<meta content="XML files, specifying, line delimiters, encoding" name="keywords" />
+<meta content="XML files, specifying line delimiters, line delimiters" name="DC.subject" />
+<meta content="XML files, specifying line delimiters, line delimiters" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tedtenc" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -30,22 +30,25 @@
<div><p>This page lets you specify the line delimiter and the text encoding
that will be used when you create or save an XML related file.</p>
-<div class="section"><p>To specify the line delimiter you want to use:</p>
+<div class="section"><p>To specify the line delimiter you want to use, complete the following
+steps:</p>
</div>
<ol>
<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
- > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span></span>.</span>
-</li>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Files</span></span>.</span></li>
-<li><span>In the <span class="uicontrol">Line delimiter</span> list, select the operating
-system that applies to your development or deployment platform. </span></li>
+<li><span>From the <span class="uicontrol">Encoding</span> field, specify the default
+character encoding set that is used when creating XML related files (DTDs,
+XML files, XML schemas). Changing the encoding causes any new, XML related
+files that are created from scratch to use the selected encoding.</span></li>
-<li><span>From the <span class="uicontrol">Encoding</span> field, specify
-the default character encoding set that is used when creating XML related
-files (DTDs, XML files, XML schemas). Changing the encoding causes any new,
-XML related files that are created from scratch to use the selected encoding.</span>
-</li>
+<li><span>Select <span class="menucascade"><span class="uicontrol">General</span> > <span class="uicontrol">Workspace</span>
+</span> in the left pane of the Preferences window and chose either <span class="uicontrol">Default</span> or <span class="uicontrol">Other</span> in
+the <span class="uicontrol">New text file line delimiter </span>section. Select the
+operating system that applies to your development or deployment platform from
+the <span class="uicontrol">Other</span> drop down list.</span></li>
<li><span>Click <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span>.</span>
</li>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
index 83dc689..978815c 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tedtgram" xml:lang="en-us">
<title>Updating XML files with changes made to DTDs and schemas</title>
<titlealts>
@@ -18,17 +19,16 @@
<taskbody>
<context><p>For example, you have a DTD file called "Contact.dtd" and an XML
file called "Contact.xml" associated with it. Contact.dtd contains a root
-element called <uicontrol>Contact</uicontrol> that can contain any of the
-following children elements: <uicontrol>Name</uicontrol>, <uicontrol>PostalAddress</uicontrol>,
- <uicontrol>Email</uicontrol>. If you remove the child element <uicontrol>Email</uicontrol> from
-the DTD, you will no longer be able to add an <uicontrol>Email</uicontrol> child
-element to your root element Contact in your Contact.xml file. This change,
-however, will not come into effect until you save your changes in the DTD
-and click <uicontrol>XML > Reload Dependencies</uicontrol> in the XML editor.
-Until you click it, you will still be able to add <uicontrol>Email</uicontrol> elements
-to Contact.xml.</p><p>This feature is very handy when you are making updates
-to both DTDs and XML schemas and XML files that are associated with DTDs and
-XML schemas.</p></context>
+element called <userinput>Contact</userinput> that can contain any of the
+following children elements: <userinput>Name</userinput>, <userinput>PostalAddress</userinput>,<?Pub Caret?> <userinput>Email</userinput>.
+If you remove the child element <userinput>Email</userinput> from the DTD,
+you will no longer be able to add an <userinput>Email</userinput> child element
+to your root element Contact in your Contact.xml file. This change, however,
+will not come into effect until you save your changes in the DTD and click <uicontrol>XML
+> Reload Dependencies</uicontrol> in the XML editor. Until you click it, you
+will still be able to add <userinput>Email</userinput> elements to Contact.xml.</p><p>This
+feature is very handy when you are making updates to both DTDs and XML schemas
+and XML files that are associated with DTDs and XML schemas.</p></context>
</taskbody>
</task>
-<?Pub *0000002040?>
+<?Pub *0000001987?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
index d1aba1d..686e23b 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Updating XML files with changes made to DTDs and schemas" />
<meta name="abstract" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
<meta name="description" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
-<meta content="XML editor, updating, XML files with associated changes, XML files, updating with associated changes" name="DC.subject" />
-<meta content="XML editor, updating, XML files with associated changes, XML files, updating with associated changes" name="keywords" />
+<meta content="XML editor, updating XML files, XML files, updating with associated changes" name="DC.subject" />
+<meta content="XML editor, updating XML files, XML files, updating with associated changes" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
@@ -42,18 +42,17 @@
<div class="section"><p>For example, you have a DTD file called "Contact.dtd" and an XML
file called "Contact.xml" associated with it. Contact.dtd contains a root
-element called <span class="uicontrol">Contact</span> that can contain any of the
-following children elements: <span class="uicontrol">Name</span>, <span class="uicontrol">PostalAddress</span>,
- <span class="uicontrol">Email</span>. If you remove the child element <span class="uicontrol">Email</span> from
-the DTD, you will no longer be able to add an <span class="uicontrol">Email</span> child
-element to your root element Contact in your Contact.xml file. This change,
-however, will not come into effect until you save your changes in the DTD
-and click <span class="uicontrol">XML > Reload Dependencies</span> in the XML editor.
-Until you click it, you will still be able to add <span class="uicontrol">Email</span> elements
-to Contact.xml.</p>
-<p>This feature is very handy when you are making updates
-to both DTDs and XML schemas and XML files that are associated with DTDs and
-XML schemas.</p>
+element called <kbd class="userinput">Contact</kbd> that can contain any of the
+following children elements: <kbd class="userinput">Name</kbd>, <kbd class="userinput">PostalAddress</kbd>, <kbd class="userinput">Email</kbd>.
+If you remove the child element <kbd class="userinput">Email</kbd> from the DTD,
+you will no longer be able to add an <kbd class="userinput">Email</kbd> child element
+to your root element Contact in your Contact.xml file. This change, however,
+will not come into effect until you save your changes in the DTD and click <span class="uicontrol">XML
+> Reload Dependencies</span> in the XML editor. Until you click it, you
+will still be able to add <kbd class="userinput">Email</kbd> elements to Contact.xml.</p>
+<p>This
+feature is very handy when you are making updates to both DTDs and XML schemas
+and XML files that are associated with DTDs and XML schemas.</p>
</div>
</div>
@@ -62,9 +61,9 @@
<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
+<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
index 0450ec7..1799d11 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
@@ -1,34 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tedtproc" xml:lang="en-us">
<title>Editing XML processing instructions</title>
<titlealts>
<searchtitle>Editing XML processing instructions</searchtitle>
</titlealts>
-<shortdesc>If you have instructions you want to pass along to an application
-using an XML document, you can use a processing instruction. </shortdesc>
+<shortdesc>If you have instructions you want to send to an application using
+an XML document, you can use a processing instruction. </shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>processing instructions</indexterm></indexterm>
<indexterm>XML files<indexterm>processing instructions</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
-<context><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p><p>To edit a processing
-instruction, follow these steps:</p></context>
-<steps>
-<step><cmd>In the Design view of the XML editor, right-click your processing
-instruction, and click <uicontrol>Edit Processing Instruction</uicontrol>.</cmd>
-</step>
-<step><cmd>The <uicontrol>Target</uicontrol> field is used to identify the
-application the instructions belongs to.</cmd></step>
-<step><cmd>The <uicontrol>Data</uicontrol> field contains the instructions.</cmd>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq>To create a new processing instruction, right-click in the Design
+<context><p>To create a new processing instruction, right-click in the Design
view, and click <uicontrol>Add Child</uicontrol>, <uicontrol>Add Before</uicontrol> or <uicontrol>Add
-After</uicontrol>, then click <uicontrol>Add Processing Instruction</uicontrol>.</postreq>
+After</uicontrol>, then click <uicontrol>Add Processing Instruction</uicontrol>.</p><p>To
+edit a processing instruction in the XML editor Design view, right-click your
+processing instruction, and click <uicontrol>Edit Processing Instruction</uicontrol>.
+You can change the values in the following fields:</p><ul>
+<li>The <uicontrol>Target</uicontrol> field is used to identify the application
+the instructions belongs to.</li>
+<li>The <uicontrol>Data</uicontrol> field contains the instructions.</li>
+</ul></context>
+<postreq>Click <uicontrol>OK</uicontrol> to save your settings.<note>These<?Pub Caret?>
+instructions were written for the Resource perspective, but they will also
+work in many other perspectives.</note></postreq>
</taskbody>
</task>
+<?Pub *0000001650?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
index c00534a..e5de866 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Editing XML processing instructions" />
-<meta name="abstract" content="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction." />
-<meta name="description" content="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction." />
-<meta content="XML editor, editing, processing instructions, editing, XML files" name="DC.subject" />
-<meta content="XML editor, editing, processing instructions, editing, XML files" name="keywords" />
+<meta name="abstract" content="If you have instructions you want to send to an application using an XML document, you can use a processing instruction." />
+<meta name="description" content="If you have instructions you want to send to an application using an XML document, you can use a processing instruction." />
+<meta content="XML editor, processing instructions, XML files" name="DC.subject" />
+<meta content="XML editor, processing instructions, XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
<meta content="XHTML" name="DC.Format" />
<meta content="tedtproc" name="DC.Identifier" />
@@ -28,33 +28,29 @@
-<div><p>If you have instructions you want to pass along to an application
-using an XML document, you can use a processing instruction. </p>
+<div><p>If you have instructions you want to send to an application using
+an XML document, you can use a processing instruction. </p>
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit a processing
-instruction, follow these steps:</p>
+<div class="section"><p>To create a new processing instruction, right-click in the Design
+view, and click <span class="uicontrol">Add Child</span>, <span class="uicontrol">Add Before</span> or <span class="uicontrol">Add
+After</span>, then click <span class="uicontrol">Add Processing Instruction</span>.</p>
+<p>To
+edit a processing instruction in the XML editor Design view, right-click your
+processing instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.
+You can change the values in the following fields:</p>
+<ul>
+<li>The <span class="uicontrol">Target</span> field is used to identify the application
+the instructions belongs to.</li>
+
+<li>The <span class="uicontrol">Data</span> field contains the instructions.</li>
+
+</ul>
</div>
-<ol>
-<li><span>In the Design view of the XML editor, right-click your processing
-instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.</span>
-</li>
-
-<li><span>The <span class="uicontrol">Target</span> field is used to identify the
-application the instructions belongs to.</span></li>
-
-<li><span>The <span class="uicontrol">Data</span> field contains the instructions.</span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">To create a new processing instruction, right-click in the Design
-view, and click <span class="uicontrol">Add Child</span>, <span class="uicontrol">Add Before</span> or <span class="uicontrol">Add
-After</span>, then click <span class="uicontrol">Add Processing Instruction</span>.</div>
+<div class="section">Click <span class="uicontrol">OK</span> to save your settings.<div class="note"><span class="notetitle">Note:</span> These
+instructions were written for the Resource perspective, but they will also
+work in many other perspectives.</div>
+</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
index f016bfc..116db62 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="tedtsch" xml:lang="en-us">
<title>Editing namespace information</title>
<titlealts>
@@ -19,7 +20,7 @@
<taskbody>
<context><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p><p>To edit your schema
-information, follow these steps:</p></context>
+information, complete the following steps:</p></context>
<steps>
<step><cmd>In the Design view of the XML editor, right-click your root element
and click <uicontrol>Edit Namespaces</uicontrol>.</cmd></step>
@@ -29,8 +30,9 @@
<step><cmd>The value in the <uicontrol>Namespace Name</uicontrol> field is
a namespace the XML file is associated with.</cmd><info>Your XML file should
be associated with the same namespace(s) its XML schema is associated with.
-For more information about namespaces, refer to the related reference.</info>
-</step>
+For more information about namespaces, refer to the related reference. For
+more information, see <xref format="html" href="/../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"
+scope="peer">XML namespaces</xref>.</info></step>
<step><cmd>All qualified elements and attributes in the XML file associated
with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>
</step>
@@ -42,9 +44,9 @@
</step>
</steps>
<result><p>If you want to create a new association, click <uicontrol>Add</uicontrol> instead
-of <uicontrol>Edit</uicontrol>. You can then either click the <uicontrol>Specify
+of <uicontrol>Edit</uicontrol>. You can then either select the <uicontrol><?Pub Caret1?>Specify
From Registered Namespace</uicontrol> radio button and select the namespace
-declarations you want to add or click the <uicontrol>Specify New Namespace</uicontrol> radio
+declarations you want to add or select the <uicontrol>Specify New Namespace</uicontrol> radio
button and fill in the fields as necessary.</p></result>
<postreq>If you do not have namespace information in your XML file, you can
right-click your root element in the Design view and click <uicontrol>Edit
@@ -52,3 +54,4 @@
create one before you can add the namespace information.</postreq>
</taskbody>
</task>
+<?Pub *0000003265?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
index d269381..17e6a0d 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Editing namespace information" />
<meta name="abstract" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
<meta name="description" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
-<meta content="XML editor, editing, namespace information, XML files" name="DC.subject" />
-<meta content="XML editor, editing, namespace information, XML files" name="keywords" />
+<meta content="XML editor, namespace information, XML files" name="DC.subject" />
+<meta content="XML editor, namespace information, XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
@@ -42,7 +42,7 @@
<div class="section"><p>The following instructions were written for the Resource perspective,
but they will also work in many other perspectives.</p>
<p>To edit your schema
-information, follow these steps:</p>
+information, complete the following steps:</p>
</div>
<ol>
@@ -56,8 +56,8 @@
<li class="stepexpand"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
a namespace the XML file is associated with.</span> Your XML file should
be associated with the same namespace(s) its XML schema is associated with.
-For more information about namespaces, refer to the related reference.
-</li>
+For more information about namespaces, refer to the related reference. For
+more information, see <a href="/../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita">XML namespaces</a>.</li>
<li class="stepexpand"><span>All qualified elements and attributes in the XML file associated
with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</span>
@@ -74,9 +74,9 @@
</ol>
<div class="section"><p>If you want to create a new association, click <span class="uicontrol">Add</span> instead
-of <span class="uicontrol">Edit</span>. You can then either click the <span class="uicontrol">Specify
+of <span class="uicontrol">Edit</span>. You can then either select the <span class="uicontrol">Specify
From Registered Namespace</span> radio button and select the namespace
-declarations you want to add or click the <span class="uicontrol">Specify New Namespace</span> radio
+declarations you want to add or select the <span class="uicontrol">Specify New Namespace</span> radio
button and fill in the fields as necessary.</p>
</div>
@@ -91,8 +91,8 @@
<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
+<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
+<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
index 2f5d1b5..00b8f28 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
@@ -1,34 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="xmlsourcesuggestionstrategy" xml:lang="en-us">
<title>Setting the XML source suggestion strategy used by content assist</title>
<shortdesc>You can customize the formatting of the suggestions given by content
assist by choosing a suggestion strategy preference. When the suggestion strategy
-is set to "Strict", suggestions that are 'strictly' grammatically valid will
-be displayed first in the list of options and highlighted by bold icons. Other
-suggestions that are applicable to this element's scope but are not grammatically
-valid, will be displayed lower in the list with de-emphasized icons. When
-the suggestion strategy is set to "Lax", all suggestions will displayed in
-the list with de-emphasized icons.</shortdesc>
+is set to Strict, suggestions that are grammatically valid will be displayed
+first in the list of options and highlighted by bold icons. Other suggestions
+that are applicable to this element's scope but are not grammatically valid
+will be displayed lower in the list with de-emphasized icons. When the suggestion
+strategy is set to Lax, all suggestions will displayed in the list with de-emphasized
+icons.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>source suggestion strategy</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
-<context>To set the suggestion strategy used by content assist:</context>
+<context>To set the suggestion strategy used by content assist, complete the
+following steps:</context>
<steps>
-<step><cmd>From the menu bar, Click <menucascade><uicontrol>Window</uicontrol>
-<uicontrol>Preferences</uicontrol></menucascade></cmd></step>
-<step><cmd>Select <menucascade><uicontrol>Web and XML</uicontrol><uicontrol>XML
-Files</uicontrol><uicontrol>XML Source</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Beside Suggestion strategy in the Content assist section, select
-the appropriate setting (for example, <uicontrol>Strict</uicontrol>).</cmd>
-</step>
+<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files</uicontrol><uicontrol>Editor</uicontrol></menucascade></cmd></step>
+<step><cmd>Beside <uicontrol>Suggestion strategy</uicontrol> in the Content
+assist section, select the appropriate setting (Strict or Lax).</cmd></step><?Pub Caret?>
+<step><cmd>Click <uicontrol>Apply</uicontrol>, then <uicontrol>OK</uicontrol> to
+save your settings</cmd></step>
</steps>
<example><p>The following screen capture demonstrates content assist with
the suggestion strategy set to "Strict":</p><image href="../images/suggestion.gif"
placement="break"><alt>Example of Strict Suggestion Strategy</alt></image></example>
</taskbody>
</task>
-<?Pub *0000001917?>
+<?Pub *0000001950?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
index 274ff98..70a8055 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Setting the XML source suggestion strategy used by content assist" />
-<meta name="abstract" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to "Strict", suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to "Lax", all suggestions will displayed in the list with de-emphasized icons." />
-<meta name="description" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to "Strict", suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to "Lax", all suggestions will displayed in the list with de-emphasized icons." />
-<meta content="XML editor, setting, source suggestion strategy" name="DC.subject" />
-<meta content="XML editor, setting, source suggestion strategy" name="keywords" />
+<meta name="abstract" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons." />
+<meta name="description" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons." />
+<meta content="XML editor, source suggestion strategy" name="DC.subject" />
+<meta content="XML editor, source suggestion strategy" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
<meta content="XHTML" name="DC.Format" />
<meta content="xmlsourcesuggestionstrategy" name="DC.Identifier" />
@@ -29,25 +29,26 @@
<div><p>You can customize the formatting of the suggestions given by content
assist by choosing a suggestion strategy preference. When the suggestion strategy
-is set to "Strict", suggestions that are 'strictly' grammatically valid will
-be displayed first in the list of options and highlighted by bold icons. Other
-suggestions that are applicable to this element's scope but are not grammatically
-valid, will be displayed lower in the list with de-emphasized icons. When
-the suggestion strategy is set to "Lax", all suggestions will displayed in
-the list with de-emphasized icons.</p>
+is set to Strict, suggestions that are grammatically valid will be displayed
+first in the list of options and highlighted by bold icons. Other suggestions
+that are applicable to this element's scope but are not grammatically valid
+will be displayed lower in the list with de-emphasized icons. When the suggestion
+strategy is set to Lax, all suggestions will displayed in the list with de-emphasized
+icons.</p>
-<div class="section">To set the suggestion strategy used by content assist:</div>
+<div class="section">To set the suggestion strategy used by content assist, complete the
+following steps:</div>
<ol>
-<li><span>From the menu bar, Click <span class="menucascade"><span class="uicontrol">Window</span>
- > <span class="uicontrol">Preferences</span></span></span></li>
+<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Files</span> > <span class="uicontrol">Editor</span></span></span></li>
-<li><span>Select <span class="menucascade"><span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML
-Files</span> > <span class="uicontrol">XML Source</span></span>.</span></li>
+<li><span>Beside <span class="uicontrol">Suggestion strategy</span> in the Content
+assist section, select the appropriate setting (Strict or Lax).</span></li>
-<li><span>Beside Suggestion strategy in the Content assist section, select
-the appropriate setting (for example, <span class="uicontrol">Strict</span>).</span>
-</li>
+<li><span>Click <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span> to
+save your settings</span></li>
</ol>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
index d150697..85a8914 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
<task id="ttaghilt" xml:lang="en-us">
<title>Setting source highlighting styles</title>
<titlealts>
@@ -14,31 +16,32 @@
</keywords>
</metadata></prolog>
<taskbody>
-<context><p>To set highlighting styles for the XML code, follow these steps:</p></context>
+<context><p>To set highlighting styles for the XML code, complete the following
+steps:</p></context>
<steps>
<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol> XML
-Styles</uicontrol></menucascade>.</cmd></step>
-<step><cmd>In the <uicontrol>Content type</uicontrol> list, select the source
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files</uicontrol><uicontrol> Syntax Coloring</uicontrol></menucascade>.</cmd>
+</step>
+<step><cmd>In the <uicontrol>Syntax Element</uicontrol> list, select the source
tag type that you wish to set a highlighting style for. You can also click
-text in the sample text to specify the source tag type that you wish to set
-a highlighting style for.</cmd></step>
-<step><cmd>Click the <uicontrol>Foreground</uicontrol> box.</cmd></step>
-<step><cmd>Select the color that you want the text of the tag to appear in
-and click <uicontrol>OK</uicontrol>.</cmd></step>
-<step><cmd>Click the <uicontrol>Background</uicontrol> box.</cmd></step>
-<step><cmd>Select the color that you want to appear behind the tag and click <uicontrol>OK</uicontrol>.</cmd>
+text in the <uicontrol>Sample text</uicontrol> box to specify the source tag
+type that you wish to set a highlighting style for.</cmd></step>
+<step><cmd>Click the <uicontrol>Foreground</uicontrol> box, select the color
+that you want the text of the tag to appear in, and click <uicontrol>OK</uicontrol>.</cmd>
+</step>
+<step><cmd>Click the <uicontrol>Background</uicontrol> box, select the color
+that you want to appear behind the tag, and click <uicontrol>OK</uicontrol>.</cmd>
</step>
<step><cmd>Select the <uicontrol>Bold</uicontrol> check box if you want to
make the type bold.</cmd></step>
-<step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting
-styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <uicontrol>Content type </uicontrol> field,
-the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>
-</step>
+<step><cmd> </cmd></step>
<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>
</steps>
-<result></result>
+<result>To set the highlight<?Pub Caret?>ing styles back to their default
+values, click <uicontrol>Restore Default</uicontrol>. If you only want to
+reset the value for a particular content type, select it in the <uicontrol>Syntax
+Element</uicontrol> field, then click the <uicontrol>Restore Default</uicontrol> button.</result>
</taskbody>
</task>
-<?Pub *0000002262?>
+<?Pub *0000002290?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
index de2dd48..a461cfb 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -32,43 +32,42 @@
code is displayed in the Source view of the XML editor, such as the colors
the tags will be displayed in.</p>
-<div class="section"><p>To set highlighting styles for the XML code, follow these steps:</p>
+<div class="section"><p>To set highlighting styles for the XML code, complete the following
+steps:</p>
</div>
<ol>
<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
- > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol"> XML
-Styles</span></span>.</span></li>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Files</span> > <span class="uicontrol"> Syntax Coloring</span></span>.</span>
+</li>
-<li><span>In the <span class="uicontrol">Content type</span> list, select the source
+<li><span>In the <span class="uicontrol">Syntax Element</span> list, select the source
tag type that you wish to set a highlighting style for. You can also click
-text in the sample text to specify the source tag type that you wish to set
-a highlighting style for.</span></li>
+text in the <span class="uicontrol">Sample text</span> box to specify the source tag
+type that you wish to set a highlighting style for.</span></li>
-<li><span>Click the <span class="uicontrol">Foreground</span> box.</span></li>
+<li><span>Click the <span class="uicontrol">Foreground</span> box, select the color
+that you want the text of the tag to appear in, and click <span class="uicontrol">OK</span>.</span>
+</li>
-<li><span>Select the color that you want the text of the tag to appear in
-and click <span class="uicontrol">OK</span>.</span></li>
-
-<li><span>Click the <span class="uicontrol">Background</span> box.</span></li>
-
-<li><span>Select the color that you want to appear behind the tag and click <span class="uicontrol">OK</span>.</span>
+<li><span>Click the <span class="uicontrol">Background</span> box, select the color
+that you want to appear behind the tag, and click <span class="uicontrol">OK</span>.</span>
</li>
<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
make the type bold.</span></li>
-<li><span>Click <span class="uicontrol">Restore Default</span> to set the highlighting
-styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <span class="uicontrol">Content type </span> field,
-the click the <span class="uicontrol">Restore Default</span> button next to it. </span>
-</li>
+<li><span> </span></li>
<li><span>Click <span class="uicontrol">OK</span> to save your changes.</span></li>
</ol>
-<div class="section" />
+<div class="section">To set the highlighting styles back to their default
+values, click <span class="uicontrol">Restore Default</span>. If you only want to
+reset the value for a particular content type, select it in the <span class="uicontrol">Syntax
+Element</span> field, then click the <span class="uicontrol">Restore Default</span> button.</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
index 16ba4e3..0e94754 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<?Pub Inc?>
<task id="twcdast" xml:lang="en-us">
<title>Using XML content assist</title>
@@ -12,8 +13,7 @@
to insert templates into your XML code.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>content assist</indexterm></indexterm>
-<indexterm>XML files<indexterm>content assist</indexterm></indexterm>
-</keywords>
+<indexterm>XML files<indexterm>content assist</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context><p>The placement of the cursor in your source file provides the context
@@ -25,26 +25,26 @@
</ul><p>In addition, you can set up an option that causes content assist to
pop up automatically when certain characters are typed. To set up this option,
click <menucascade><uicontrol>Window</uicontrol><uicontrol> Preferences</uicontrol>
-</menucascade> to open the Preferences window, then click <menucascade><uicontrol>Web
-and XML</uicontrol><uicontrol>XML Files </uicontrol><uicontrol>XML Source</uicontrol>
-</menucascade> . In the <uicontrol>Content assist</uicontrol> group box, select
-the <uicontrol>Automatically make suggestions</uicontrol> check box, and supply
-any additional characters that should trigger content assist.</p><p>If your
-cursor is in a position where content assist is available, a pop-up list of
-available choices is displayed when you launch content assist. The list is
-based on the context and whether a DTD or XML schema is associated with the
-XML file being edited. For example, if you have an Address element that can
-contain any of the following children elements: Name, Street, City, Zip Code,
-Country, and Province, and you place your cursor after any of them and launch
-content assist, all of the child elements will be listed in the content assist
-list.</p><p>The content assist list displays all valid tags for the current
-cursor position, including templates. If your grammar constraints are turned
-off, all available tags, not just valid ones are displayed. </p><p> </p><p>As
-you type the first one or two letters of the tag that you want, the list automatically
-refreshes with alphabetized choices that match your input.</p><p><b>Note</b>:
-The list only refreshes as described if you first type <userinput><</userinput> before
-prompting for content assist.</p><p>Scroll down and select the tag that you
-want to use by double-clicking on it. </p></context>
+</menucascade> to open the Preferences window, then select <menucascade><uicontrol>XML</uicontrol>
+<uicontrol>XML Files </uicontrol><uicontrol>Editor</uicontrol></menucascade> .
+In the <uicontrol>Content assist</uicontrol> group box, select the <uicontrol>Automatically
+make suggestions</uicontrol> check box, and supply any additional characters
+that should trigger content assist.</p><p>If your cursor is in a position
+where content assist is available, a pop-up list of available choices is displayed
+when you launch content assist. The list is based on the context and whether
+a DTD or XML schema is associated with the XML file being edited. For example,
+if you have an Address element that can contain any of the following children
+elements: Name, Street, City, Zip Code, Country, and Province, and you place
+your cursor after any of them and launch content assist, all of the child
+elements will be listed in the content assist list.</p><p>The content assist
+list displays all valid tags for the current cursor position, including templates.
+If your grammar constraints are turned off, all available tags, not just valid
+ones, are displayed. </p><p>As you type the first one or two letters of the
+tag that you want, the list automatically refreshes with alphabetized choices
+that match your input. Scroll down and select the tag that you want to use
+by double-clicking on it.<?Pub Caret?></p><note>The list only refreshes as
+described if you first type <userinput><</userinput> before prompting for
+content assist.</note></context>
</taskbody>
</task>
-<?Pub *0000003061?>
+<?Pub *0000002891?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
index f70e050..57be527 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Using XML content assist" />
<meta name="abstract" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
<meta name="description" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
-<meta content="XML editor, editing, content assist, XML files" name="DC.subject" />
-<meta content="XML editor, editing, content assist, XML files" name="keywords" />
+<meta content="XML editor, content assist, XML files" name="DC.subject" />
+<meta content="XML editor, content assist, XML files" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/twmacro.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tsugstrat.html" />
@@ -48,40 +48,38 @@
<p>In addition, you can set up an option that causes content assist to
pop up automatically when certain characters are typed. To set up this option,
click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol"> Preferences</span>
-</span> to open the Preferences window, then click <span class="menucascade"><span class="uicontrol">Web
-and XML</span> > <span class="uicontrol">XML Files </span> > <span class="uicontrol">XML Source</span>
-</span> . In the <span class="uicontrol">Content assist</span> group box, select
-the <span class="uicontrol">Automatically make suggestions</span> check box, and supply
-any additional characters that should trigger content assist.</p>
-<p>If your
-cursor is in a position where content assist is available, a pop-up list of
-available choices is displayed when you launch content assist. The list is
-based on the context and whether a DTD or XML schema is associated with the
-XML file being edited. For example, if you have an Address element that can
-contain any of the following children elements: Name, Street, City, Zip Code,
-Country, and Province, and you place your cursor after any of them and launch
-content assist, all of the child elements will be listed in the content assist
-list.</p>
-<p>The content assist list displays all valid tags for the current
-cursor position, including templates. If your grammar constraints are turned
-off, all available tags, not just valid ones are displayed. </p>
-<p> </p>
-<p>As
-you type the first one or two letters of the tag that you want, the list automatically
-refreshes with alphabetized choices that match your input.</p>
-<p><strong>Note</strong>:
-The list only refreshes as described if you first type <kbd class="userinput"><</kbd> before
-prompting for content assist.</p>
-<p>Scroll down and select the tag that you
-want to use by double-clicking on it. </p>
+</span> to open the Preferences window, then select <span class="menucascade"><span class="uicontrol">XML</span>
+ > <span class="uicontrol">XML Files </span> > <span class="uicontrol">Editor</span></span> .
+In the <span class="uicontrol">Content assist</span> group box, select the <span class="uicontrol">Automatically
+make suggestions</span> check box, and supply any additional characters
+that should trigger content assist.</p>
+<p>If your cursor is in a position
+where content assist is available, a pop-up list of available choices is displayed
+when you launch content assist. The list is based on the context and whether
+a DTD or XML schema is associated with the XML file being edited. For example,
+if you have an Address element that can contain any of the following children
+elements: Name, Street, City, Zip Code, Country, and Province, and you place
+your cursor after any of them and launch content assist, all of the child
+elements will be listed in the content assist list.</p>
+<p>The content assist
+list displays all valid tags for the current cursor position, including templates.
+If your grammar constraints are turned off, all available tags, not just valid
+ones, are displayed. </p>
+<p>As you type the first one or two letters of the
+tag that you want, the list automatically refreshes with alphabetized choices
+that match your input. Scroll down and select the tag that you want to use
+by double-clicking on it.</p>
+<div class="note"><span class="notetitle">Note:</span> The list only refreshes as
+described if you first type <kbd class="userinput"><</kbd> before prompting for
+content assist.</div>
</div>
</div>
<div><div class="reltasks"><strong>Related tasks</strong><br />
<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
-<div><a href="../topics/tsugstrat.html" title="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to "Strict", suggestions that are 'strictly' grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid, will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to "Lax", all suggestions will displayed in the list with de-emphasized icons.">Setting the XML source suggestion strategy used by content assist</a></div>
+<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
+<div><a href="../topics/tsugstrat.html" title="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons.">Setting the XML source suggestion strategy used by content assist</a></div>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
index c7ebd9a..dd1cebc 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
<task id="twmacro" xml:lang="en-us">
<title>Working with XML templates</title>
<titlealts>
<searchtitle>Working with XML templates</searchtitle>
</titlealts>
-<shortdesc>XML content assist provides a comment template, a chunk of predefined
+<shortdesc>XML content assist provides a comment template, a section of predefined
code that you can insert into a file. You may find a template useful when
you have a certain piece of code you want to reuse several times, and you
do not want to write it out every time.</shortdesc>
@@ -16,18 +18,18 @@
</metadata></prolog>
<taskbody>
<context><p>You can use a default template as provided, customize that template,
-or create your own templates.</p>For example, you can work on a group of XML
-pages that should all contain a table with a specific appearance. Create a
-template that contains the tags for that table, including the appropriate
+or create your own templates.</p><p>For example, you can work on a group of
+XML pages that should all contain a table with a specific appearance. Create
+a template that contains the tags for that table, including the appropriate
attributes and attribute values for each tag. (You can copy and paste the
tags from a structured text editor into the template's <uicontrol>Pattern</uicontrol> field.)
Then select the name of the template from a content assist proposal list whenever
-you want to insert your custom table into an XML file.<p>To create a new XML
-template follow these steps:</p></context>
+you want to insert your custom table into an XML file.</p><p>To create a new
+XML template, complete the following steps:</p></context>
<steps>
<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML
-Templates</uicontrol></menucascade>.</cmd></step>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files</uicontrol><uicontrol>Templates</uicontrol></menucascade>.</cmd></step>
<step><cmd>Click <uicontrol>New</uicontrol> if you want to create a completely
new template.</cmd></step>
<step><cmd>Supply a new template <uicontrol>Name</uicontrol> and <uicontrol>Description</uicontrol>.</cmd>
@@ -41,7 +43,7 @@
<step><cmd>If you want to insert a variable, click the <uicontrol>Insert Variable</uicontrol> button
and select the variable to be inserted. </cmd><info>For example, the <b>date</b> variable
indicates the current date will be inserted. </info></step>
-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
+<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Apply<?Pub Caret?></uicontrol> to
save your changes.</cmd></step>
</steps>
<postreq>You can edit, remove, import, or export a template by using the same
@@ -49,8 +51,8 @@
it to its default value. You can also restore a removed template if you have
not exited from the workbench since it was removed. <p>If you have a template
that you do not want to remove but you no longer want it to appear in the
-content assist list, go to the <b>XML Templates</b> preferences page and clear
-its check box.</p></postreq>
+content assist list, clear its check box in the table on the Templates preferences
+page.</p></postreq>
</taskbody>
</task>
-<?Pub *0000003427?>
+<?Pub *0000003238?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
index 5cfc519..cd16ee4 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Working with XML templates" />
-<meta name="abstract" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta name="description" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="XML templates, creating, editing, XML templates, removing, importing, exporting" name="DC.subject" />
-<meta content="XML templates, creating, editing, XML templates, removing, importing, exporting" name="keywords" />
+<meta name="abstract" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
+<meta name="description" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
+<meta content="XML templates, working with predefined code" name="DC.subject" />
+<meta content="XML templates, working with predefined code" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
<meta content="XHTML" name="DC.Format" />
@@ -29,27 +29,28 @@
-<div><p>XML content assist provides a comment template, a chunk of predefined
+<div><p>XML content assist provides a comment template, a section of predefined
code that you can insert into a file. You may find a template useful when
you have a certain piece of code you want to reuse several times, and you
do not want to write it out every time.</p>
<div class="section"><p>You can use a default template as provided, customize that template,
or create your own templates.</p>
-For example, you can work on a group of XML
-pages that should all contain a table with a specific appearance. Create a
-template that contains the tags for that table, including the appropriate
+<p>For example, you can work on a group of
+XML pages that should all contain a table with a specific appearance. Create
+a template that contains the tags for that table, including the appropriate
attributes and attribute values for each tag. (You can copy and paste the
tags from a structured text editor into the template's <span class="uicontrol">Pattern</span> field.)
Then select the name of the template from a content assist proposal list whenever
-you want to insert your custom table into an XML file.<p>To create a new XML
-template follow these steps:</p>
+you want to insert your custom table into an XML file.</p>
+<p>To create a new
+XML template, complete the following steps:</p>
</div>
<ol>
<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
- > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
-Templates</span></span>.</span></li>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Files</span> > <span class="uicontrol">Templates</span></span>.</span></li>
<li class="stepexpand"><span>Click <span class="uicontrol">New</span> if you want to create a completely
new template.</span></li>
@@ -69,7 +70,7 @@
and select the variable to be inserted. </span> For example, the <strong>date</strong> variable
indicates the current date will be inserted. </li>
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
+<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> and then <span class="uicontrol">Apply</span> to
save your changes.</span></li>
</ol>
@@ -79,8 +80,8 @@
it to its default value. You can also restore a removed template if you have
not exited from the workbench since it was removed. <p>If you have a template
that you do not want to remove but you no longer want it to appear in the
-content assist list, go to the <strong>XML Templates</strong> preferences page and clear
-its check box.</p>
+content assist list, clear its check box in the table on the Templates preferences
+page.</p>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
index 09e77a0..1adfec2 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
@@ -22,24 +22,20 @@
highlighting, tree view, and so on. Many formation errors are easy to spot
in the syntax highlighting, so you can easily correct obvious errors on-the-fly.
However, there will be other cases when it will be beneficial to perform formal
-validation on your documents.</p></context>
-<steps>
-<step><cmd>You can validate your file by selecting it in the Navigator view,
-right-clicking it, and clicking <uicontrol>Validate</uicontrol>.</cmd>
-</step>
-</steps>
-<result><p>Any validation problems are indicated in the Problems view. </p></result>
-<postreq><p>In the Problems view, you can double-click on individual errors,
-and you will be taken to the invalid tag in the file, so that you can make
-corrections. </p><p><b>Note</b>: If you receive an error message indicating
-that the Problems view is full, you can increase the number of error messages
-allowed by selecting <menucascade><uicontrol>Properties</uicontrol><uicontrol>Validation</uicontrol>
-</menucascade> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You must select the <uicontrol>Override validation
-preferences</uicontrol> check box in order to be able to do this.</p><p>As
-well, you can set up a project's properties so that different types of project
-resources are automatically validated when you save them. From a project's
-pop-up menu select <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.
+validation on your documents.</p><p>You can validate your file by selecting
+it in the Navigator view, right-clicking it, and clicking <uicontrol>Validate</uicontrol>.
+Any validation problems are indicated in the Problems view. You can double-click
+on individual errors, and you will be taken to the invalid tag in the file,
+so that you can make corrections.</p></context>
+<postreq><note> If you receive an error message indicating that the Problems
+view is full, you can increase the number of error messages allowed by clicking <menucascade>
+<uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol></menucascade> and
+selecting <menucascade><uicontrol>General</uicontrol><uicontrol>Markers</uicontrol>
+</menucascade>. Select the <uicontrol>Use marker limits</uicontrol> check
+box and change the number in the <uicontrol>Limit visible items per group</uicontrol> <?Pub Caret?>field.</note><p>You
+can set up a project's properties so that different types of project resources
+are automatically validated when you save them. From a project's pop-up menu,
+click <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.
Any validators you can run against your project will be listed in the Validation
page.</p></postreq>
</taskbody>
@@ -48,4 +44,4 @@
<linktext>Validating code in enterprise applications</linktext></link>
</related-links>
</task>
-<?Pub *0000002727?>
+<?Pub *0000002658?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
index 0b9ab90..ce22a1e 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -41,30 +41,23 @@
in the syntax highlighting, so you can easily correct obvious errors on-the-fly.
However, there will be other cases when it will be beneficial to perform formal
validation on your documents.</p>
+<p>You can validate your file by selecting
+it in the Navigator view, right-clicking it, and clicking <span class="uicontrol">Validate</span>.
+Any validation problems are indicated in the Problems view. You can double-click
+on individual errors, and you will be taken to the invalid tag in the file,
+so that you can make corrections.</p>
</div>
-
-<div class="p"><span>You can validate your file by selecting it in the Navigator view,
-right-clicking it, and clicking <span class="uicontrol">Validate</span>.</span>
-</div>
-
-
-<div class="section"><p>Any validation problems are indicated in the Problems view. </p>
-</div>
-
-<div class="section"><p>In the Problems view, you can double-click on individual errors,
-and you will be taken to the invalid tag in the file, so that you can make
-corrections. </p>
-<p><strong>Note</strong>: If you receive an error message indicating
-that the Problems view is full, you can increase the number of error messages
-allowed by selecting <span class="menucascade"><span class="uicontrol">Properties</span> > <span class="uicontrol">Validation</span>
-</span> from the project's pop-up menu and specifying the maximum number
-of error messages allowed. You must select the <span class="uicontrol">Override validation
-preferences</span> check box in order to be able to do this.</p>
-<p>As
-well, you can set up a project's properties so that different types of project
-resources are automatically validated when you save them. From a project's
-pop-up menu select <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
+<div class="section"><div class="note"><span class="notetitle">Note:</span> If you receive an error message indicating that the Problems
+view is full, you can increase the number of error messages allowed by clicking <span class="menucascade">
+<span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span> and
+selecting <span class="menucascade"><span class="uicontrol">General</span> > <span class="uicontrol">Markers</span>
+</span>. Select the <span class="uicontrol">Use marker limits</span> check
+box and change the number in the <span class="uicontrol">Limit visible items per group</span> field.</div>
+<p>You
+can set up a project's properties so that different types of project resources
+are automatically validated when you save them. From a project's pop-up menu,
+click <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
Any validators you can run against your project will be listed in the Validation
page.</p>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
index c0b5f94..c179f07 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<?Pub Inc?>
<task id="txedtdes" xml:lang="en-us">
<title>Editing in the Design view</title>
@@ -17,7 +18,7 @@
</keywords>
</metadata></prolog>
<taskbody>
-<context><p> For example, the <uicontrol>Add child</uicontrol> menu item will
+<context><p>For example, the <uicontrol>Add child</uicontrol> menu item will
list only those elements from a DTD or XML schema which would be valid children
at that point.</p><p>When you have an XML file associated with an XML schema
or DTD file, certain tags and rules for that file have already been established,
@@ -28,67 +29,104 @@
new elements and attributes.</p><p>For any XML file associated with an XML
schema or DTD file, you can use the Design view to add any items defined in
the XML schema or DTD (such as elements and attributes) to the XML file. You
-can also use it to add processing instructions and comments to all XML files.</p><p>For
-more information on the icons used in the Design view, refer to the related
-reference.</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 XML file in the Design view, follow these steps:</p></context>
-<steps>
-<step><cmd>Open the XML file that you want to work with in the XML editor
-(right-click the file in the Navigator view and click <uicontrol>Open With
-> XML Editor</uicontrol>). If necessary, click the <uicontrol>Design</uicontrol> tab.</cmd>
-</step>
-<step><cmd>To expand all the items in your XML file, click the <uicontrol>Expand
-All</uicontrol> toolbar button <image href="../images/expand_all.gif"><alt>This
-graphic is the Expand All toolbar button</alt></image>.</cmd></step>
-<step><cmd>To collapse them, click the <uicontrol>Collapse All</uicontrol> toolbar
-button <image href="../images/collapse_all.gif"><alt>This graphic is the
-Collapse All toolbar button</alt></image>.</cmd></step>
-<step><cmd>Right-click the item that you want to work with.</cmd><info>Some
+can also use it to add processing instructions and comments to all XML files.</p><p>To
+open and edit a XML file in the XML editor, right-click the file in the Navigator
+view and click <uicontrol>Open With > XML Editor</uicontrol>. If necessary,
+click the <uicontrol>Design</uicontrol> tab to open the Design view.</p><p>To
+expand all the items in your XML file, click <menucascade><uicontrol>XML</uicontrol>
+<uicontrol>Expand All</uicontrol></menucascade> <image href="../images/expand_all.gif">
+<alt>This graphic is the Expand All toolbar button</alt></image> on the toolbar.
+To collapse them, click the <menucascade><uicontrol>XML</uicontrol><uicontrol>Collapse
+A<?Pub Caret?>ll</uicontrol></menucascade> <image href="../images/collapse_all.gif">
+<alt>This graphic is the Collapse All toolbar button</alt></image> on the
+toolbar.</p><p>If you right-click the item that you want to work with, some
or all of the following options (as applicable) will be available from the
-pop-up menu that appears:<ul>
-<li> <uicontrol>Add DTD Information</uicontrol> - Click this if you want to
-associate the XML file with a DTD.</li>
-<li> <uicontrol>Edit DOCTYPE</uicontrol> - Click this if you want to edit
-the DOCTYPE declaration. Refer to the related task for more details.</li>
-<li> <uicontrol>Edit Namespaces</uicontrol> - Click this if you want to edit
-the existing namespace information or create a new association with a namespace.
-Refer to the related task for more details.</li>
-<li> <uicontrol>Edit Processing Instruction</uicontrol> - Click this if you
-want to edit the processing instruction. Refer to the related task for more
-details.</li>
-<li> <uicontrol>Remove</uicontrol> - Click this if you want to remove the
-item that you have selected from the XML file. This option will not be available
-if the item you want to remove must exist (for example, in your DTD, you have
-declared that "One or more" of the item must always exist in your XML file,
-and the item you have selected is the only one that exists in your XML file).</li>
-<li> <uicontrol>Add Attribute</uicontrol> - Click this if you want to add
-an attribute to the element that you selected. Any attributes you are allowed
-to add to the element will be listed. After you have added the attribute to
-the XML file, you can click in the right-hand column to change the value of
-the attribute. If the attribute has set values, they will appear in a list.</li>
-<li> <uicontrol>Add Child</uicontrol> - Click this to add another element,
-a comment, or a processing instruction as a child of the parent element.</li>
-<li> <uicontrol>Add Before</uicontrol> - Click this to add a child element,
-comment, or processing instruction that can go before the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <menucascade><uicontrol>Add Before</uicontrol><uicontrol> CD</uicontrol>
-</menucascade> , as a CD element can go before another CD element.</li>
-<li> <uicontrol>Add After</uicontrol> - Click this to add a child element,
-comment, or processing instruction that can go after the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <menucascade><uicontrol>Add After</uicontrol><uicontrol> CD</uicontrol>
-</menucascade>, as a CD element can go after another CD element.</li>
-<li> <uicontrol>Replace With</uicontrol> - Click this if you want to replace
-one item with another. This option is not available if you turn grammar constraints
-off or if there are no valid alternatives for you to replace the item with.</li>
-</ul></info></step>
-<step><cmd>Click the appropriate option.</cmd></step>
-</steps>
+pop-up menu that appears:</p><p></p><table>
+<tgroup cols="2"><colspec colname="col1" colwidth="48*"/><colspec colname="col2"
+colwidth="150*"/>
+<thead>
+<row valign="bottom">
+<entry colname="col1">Select this</entry>
+<entry colname="col2">If you want to do this</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="col1">Add DTD Information</entry>
+<entry colname="col2">Associate the XML file with a DTD.</entry>
+</row>
+<row>
+<entry colname="col1">Edit DOCTYPE</entry>
+<entry colname="col2">Edit the DOCTYPE declaration. Refer to the related task
+for more details. For more information, see <xref format="html" href="tedtdoc.dita"
+scope="peer">Editing DOCTYPE declarations</xref>.</entry>
+</row>
+<row>
+<entry colname="col1">Edit Namespaces</entry>
+<entry colname="col2">Edit the existing namespace information or create a
+new association with a namespace. Refer to the related task for more details.
+For more information, see <xref format="html" href="tedtsch.dita" scope="peer">Editing
+namespace information</xref>.</entry>
+</row>
+<row>
+<entry colname="col1">Edit Processing Instruction</entry>
+<entry colname="col2">Edit the processing instruction. Refer to the related
+task for more details. For more information, see <xref format="html" href="tedtproc.dita"
+scope="peer">Editing XML processing instructions</xref>.</entry>
+</row>
+<row>
+<entry colname="col1">Remove</entry>
+<entry colname="col2">Remove the item that you have selected from the XML
+file. If the selected item or related items are defined so that the item must
+exist in the file, this option will not be available. For example, in your
+DTD, if you have declared that "One or more" of the item must always exist
+in your XML file, and the item you have selected is the only one that exists
+in your XML file.</entry>
+</row>
+<row>
+<entry colname="col1">Add Attribute</entry>
+<entry colname="col2">Add an attribute to the element that you selected. Any
+attributes you are allowed to add to the element will be listed. After you
+have added the attribute to the XML file, you can click in the right-hand
+column to change the value of the attribute. If the attribute has set values,
+they will appear in a list.</entry>
+</row>
+<row>
+<entry colname="col1">Add Child</entry>
+<entry colname="col2">Add another element, a comment, or a processing instruction
+as a child of the parent element.</entry>
+</row>
+<row>
+<entry colname="col1">Add Before</entry>
+<entry colname="col2">Add a child element, comment, or processing instruction
+that can go before the item you have selected. For example, if you have a
+parent element called <userinput>CD Collections</userinput> that can contain
+an unlimited amount of children called <userinput>CD</userinput>, you could
+click a <userinput>CD</userinput> element and click <menucascade><uicontrol>Add
+Before</uicontrol><uicontrol> CD</uicontrol></menucascade> , as a <userinput>CD</userinput> element
+can go before another <userinput>CD</userinput> element.</entry>
+</row>
+<row>
+<entry colname="col1">Add After</entry>
+<entry colname="col2">Add a child element, comment, or processing instruction
+that can go after the item you have selected. For example, if you have a parent
+element called <userinput>CD Collections</userinput> that can contain an unlimited
+amount of children called <userinput>CD</userinput>, you could click a <userinput>CD</userinput> element
+and click <menucascade><uicontrol>Add After</uicontrol><uicontrol> CD</uicontrol>
+</menucascade>, as a <userinput>CD</userinput> element can go after another <userinput>CD</userinput> element.</entry>
+</row>
+<row>
+<entry colname="col1">Replace With</entry>
+<entry colname="col2">Replace one item with another. This option is not available
+if you turn grammar constraints off or if there are no valid alternatives
+for you to replace the item with.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></context>
<result><p>Any changes you make in the Design view are also reflected in the
-Source view and the Outline view.</p></result>
+Source view and the Outline view.</p><note>These instructions were written
+for the Resource perspective, but they will also work in many other perspectives.</note></result>
</taskbody>
</task>
-<?Pub *0000005971?>
+<?Pub *0000006781?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
index ace05b2..91c1d1e 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Editing in the Design view" />
<meta name="abstract" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
<meta name="description" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
-<meta content="XML editor, editing, in the Design view" name="DC.subject" />
-<meta content="XML editor, editing, in the Design view" name="keywords" />
+<meta content="XML editor, Design view" name="DC.subject" />
+<meta content="XML editor, Design view" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
@@ -40,7 +40,7 @@
while pop-up menus on the tree elements give alternatives that are valid for
that particular element.</p>
-<div class="section"><p> For example, the <span class="uicontrol">Add child</span> menu item will
+<div class="section"><p>For example, the <span class="uicontrol">Add child</span> menu item will
list only those elements from a DTD or XML schema which would be valid children
at that point.</p>
<p>When you have an XML file associated with an XML schema
@@ -54,86 +54,140 @@
schema or DTD file, you can use the Design view to add any items defined in
the XML schema or DTD (such as elements and attributes) to the XML file. You
can also use it to add processing instructions and comments to all XML files.</p>
-<p>For
-more information on the icons used in the Design view, refer to the related
-reference.</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 XML file in the Design view, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file that you want to work with in the XML editor
-(right-click the file in the Navigator view and click <span class="uicontrol">Open With
-> XML Editor</span>). If necessary, click the <span class="uicontrol">Design</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>To expand all the items in your XML file, click the <span class="uicontrol">Expand
-All</span> toolbar button <img src="../images/expand_all.gif" alt="This graphic is the Expand All toolbar button" />.</span></li>
-
-<li class="stepexpand"><span>To collapse them, click the <span class="uicontrol">Collapse All</span> toolbar
-button <img src="../images/collapse_all.gif" alt="This graphic is the Collapse All toolbar button" />.</span></li>
-
-<li class="stepexpand"><span>Right-click the item that you want to work with.</span> Some
+open and edit a XML file in the XML editor, right-click the file in the Navigator
+view and click <span class="uicontrol">Open With > XML Editor</span>. If necessary,
+click the <span class="uicontrol">Design</span> tab to open the Design view.</p>
+<p>To
+expand all the items in your XML file, click <span class="menucascade"><span class="uicontrol">XML</span>
+ > <span class="uicontrol">Expand All</span></span> <img src="../images/expand_all.gif" alt="This graphic is the Expand All toolbar button" /> on the toolbar.
+To collapse them, click the <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">Collapse
+All</span></span> <img src="../images/collapse_all.gif" alt="This graphic is the Collapse All toolbar button" /> on the
+toolbar.</p>
+<p>If you right-click the item that you want to work with, some
or all of the following options (as applicable) will be available from the
-pop-up menu that appears:<ul>
-<li> <span class="uicontrol">Add DTD Information</span> - Click this if you want to
-associate the XML file with a DTD.</li>
+pop-up menu that appears:</p>
+<p />
-<li> <span class="uicontrol">Edit DOCTYPE</span> - Click this if you want to edit
-the DOCTYPE declaration. Refer to the related task for more details.</li>
+<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
+<thead align="left">
+<tr valign="bottom">
+<th valign="bottom" width="24.242424242424242%" id="N100D8">Select this</th>
-<li> <span class="uicontrol">Edit Namespaces</span> - Click this if you want to edit
-the existing namespace information or create a new association with a namespace.
-Refer to the related task for more details.</li>
+<th valign="bottom" width="75.75757575757575%" id="N100DF">If you want to do this</th>
-<li> <span class="uicontrol">Edit Processing Instruction</span> - Click this if you
-want to edit the processing instruction. Refer to the related task for more
-details.</li>
+</tr>
-<li> <span class="uicontrol">Remove</span> - Click this if you want to remove the
-item that you have selected from the XML file. This option will not be available
-if the item you want to remove must exist (for example, in your DTD, you have
-declared that "One or more" of the item must always exist in your XML file,
-and the item you have selected is the only one that exists in your XML file).</li>
+</thead>
-<li> <span class="uicontrol">Add Attribute</span> - Click this if you want to add
-an attribute to the element that you selected. Any attributes you are allowed
-to add to the element will be listed. After you have added the attribute to
-the XML file, you can click in the right-hand column to change the value of
-the attribute. If the attribute has set values, they will appear in a list.</li>
+<tbody>
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add DTD Information</td>
-<li> <span class="uicontrol">Add Child</span> - Click this to add another element,
-a comment, or a processing instruction as a child of the parent element.</li>
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Associate the XML file with a DTD.</td>
-<li> <span class="uicontrol">Add Before</span> - Click this to add a child element,
-comment, or processing instruction that can go before the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add Before</span> > <span class="uicontrol"> CD</span>
-</span> , as a CD element can go before another CD element.</li>
+</tr>
-<li> <span class="uicontrol">Add After</span> - Click this to add a child element,
-comment, or processing instruction that can go after the item you have selected.
-For example, if you have a parent element called "CD Collections" that can
-contain an unlimited amount of children called "CD", you could click a CD
-element and click <span class="menucascade"><span class="uicontrol">Add After</span> > <span class="uicontrol"> CD</span>
-</span>, as a CD element can go after another CD element.</li>
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit DOCTYPE</td>
-<li> <span class="uicontrol">Replace With</span> - Click this if you want to replace
-one item with another. This option is not available if you turn grammar constraints
-off or if there are no valid alternatives for you to replace the item with.</li>
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the DOCTYPE declaration. Refer to the related task
+for more details. For more information, see <a href="tedtdoc.dita">Editing DOCTYPE declarations</a>.</td>
-</ul>
-</li>
+</tr>
-<li class="stepexpand"><span>Click the appropriate option.</span></li>
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit Namespaces</td>
-</ol>
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the existing namespace information or create a
+new association with a namespace. Refer to the related task for more details.
+For more information, see <a href="tedtsch.dita">Editing namespace information</a>.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit Processing Instruction</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the processing instruction. Refer to the related
+task for more details. For more information, see <a href="tedtproc.dita">Editing XML processing instructions</a>.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Remove</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Remove the item that you have selected from the XML
+file. If the selected item or related items are defined so that the item must
+exist in the file, this option will not be available. For example, in your
+DTD, if you have declared that "One or more" of the item must always exist
+in your XML file, and the item you have selected is the only one that exists
+in your XML file.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Attribute</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Add an attribute to the element that you selected. Any
+attributes you are allowed to add to the element will be listed. After you
+have added the attribute to the XML file, you can click in the right-hand
+column to change the value of the attribute. If the attribute has set values,
+they will appear in a list.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Child</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Add another element, a comment, or a processing instruction
+as a child of the parent element.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Before</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Add a child element, comment, or processing instruction
+that can go before the item you have selected. For example, if you have a
+parent element called <kbd class="userinput">CD Collections</kbd> that can contain
+an unlimited amount of children called <kbd class="userinput">CD</kbd>, you could
+click a <kbd class="userinput">CD</kbd> element and click <span class="menucascade"><span class="uicontrol">Add
+Before</span> > <span class="uicontrol"> CD</span></span> , as a <kbd class="userinput">CD</kbd> element
+can go before another <kbd class="userinput">CD</kbd> element.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add After</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Add a child element, comment, or processing instruction
+that can go after the item you have selected. For example, if you have a parent
+element called <kbd class="userinput">CD Collections</kbd> that can contain an unlimited
+amount of children called <kbd class="userinput">CD</kbd>, you could click a <kbd class="userinput">CD</kbd> element
+and click <span class="menucascade"><span class="uicontrol">Add After</span> > <span class="uicontrol"> CD</span>
+</span>, as a <kbd class="userinput">CD</kbd> element can go after another <kbd class="userinput">CD</kbd> element.</td>
+
+</tr>
+
+<tr>
+<td valign="top" width="24.242424242424242%" headers="N100D8 ">Replace With</td>
+
+<td valign="top" width="75.75757575757575%" headers="N100DF ">Replace one item with another. This option is not available
+if you turn grammar constraints off or if there are no valid alternatives
+for you to replace the item with.</td>
+
+</tr>
+
+</tbody>
+
+</table>
+</div>
+</div>
<div class="section"><p>Any changes you make in the Design view are also reflected in the
Source view and the Outline view.</p>
+<div class="note"><span class="notetitle">Note:</span> These instructions were written
+for the Resource perspective, but they will also work in many other perspectives.</div>
</div>
</div>
@@ -146,7 +200,7 @@
<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="../topics/tedtproc.html" title="If you have instructions you want to pass along to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
+<div><a href="../topics/tedtproc.html" title="If you have instructions you want to send to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
</div>
<div class="relref"><strong>Related reference</strong><br />
<div><a href="../topics/rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
index a453b10..81a8fac 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="txedtsrc" xml:lang="en-us">
<title>Editing in the Source view</title>
<titlealts>
@@ -31,8 +32,8 @@
one character or set of selected characters at a time.</dd>
</dlentry><dlentry>
<dt>Content assist</dt>
-<dd>Content assist helps you finish tags and insert macros. Refer
-to the related task for more details.</dd>
+<dd>Content assist helps you finish tags and insert macros. Refer to the related
+task for more details.</dd>
</dlentry><dlentry>
<dt>Template</dt>
<dd>You can access templates (using content assist) to help you quickly add
@@ -55,28 +56,18 @@
<dt>"Smart" double clicking</dt>
<dd>You can use double-click to select attribute values, attribute-value pairs,
and entire tag sets to quickly update, copy, or remove content.</dd>
-</dlentry></dl><p>To edit an XML file in the Source view, follow these steps:</p></context>
-<steps>
-<step><cmd>Open the XML file you want to work with in the XML editor (right-click
-the file in the Navigator view and click <uicontrol>Open With > XML Editor</uicontrol>). </cmd>
-<info>You might need to click the <uicontrol>Source</uicontrol> tab. Typically,
-all that you will need to do to open the file is to double-click it in the
-Navigator view. If this does not work, right-click it and click <uicontrol>Open
-With > XML Editor</uicontrol>.</info></step>
-<step><cmd>Edit the code as necessary, using any of the available features.</cmd>
-<info>As you move the cursor within your XML file (or select items from the
-Outline view), the node selection indicator will highlight the line numbers
-that encompass the node (for example, an element or attribute). You can use
-smart double-clicking behavior to select attribute values, attribute-value
-pairs, and entire tag sets to quickly update, copy, or remove content.</info>
-</step>
-<step><cmd>At intervals, you might wish to format individual nodes, or the
-entire XML file to restore element and attribute indentation to see nesting
-hierarchies more clearly in the file.</cmd></step>
-<step><cmd>If desired, validate and save the XML file.</cmd></step>
-</steps>
+</dlentry></dl><p>To open an XML file to edit, right-click the file in the
+Navigator view and select <uicontrol>Open With > XML Editor</uicontrol>. Click
+the <uicontrol>Source</uicontrol> to see the Source view.</p><p>Edit the code
+as necessary, using any of the available features. As you move the cursor
+within your XML file (or select items from the Outline view), the node selection
+indicator will highlight the line numbers that encompass the node (for example,
+an element or attribute). You can use smart double-clicking behavior to select
+attribute values, attribute-value pairs, and entire tag sets to quickly update,
+copy, or remove content. <?Pub Caret?>If desired, validate and save the XML
+file.</p></context>
<result><p>Any changes you make in the Source view are also reflected in the
Design view and the Outline view.</p></result>
</taskbody>
</task>
-<?Pub *0000004423?>
+<?Pub *0000003781?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
index c96c43d..1095260 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Editing in the Source view" />
<meta name="abstract" content="You can use the Source view to view and work with a file's source code directly." />
<meta name="description" content="You can use the Source view to view and work with a file's source code directly." />
-<meta content="XML editor, editing, in the Source view" name="DC.subject" />
-<meta content="XML editor, editing, in the Source view" name="keywords" />
+<meta content="XML editor, Source view" name="DC.subject" />
+<meta content="XML editor, Source view" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
@@ -62,8 +62,8 @@
<dt class="dlterm">Content assist</dt>
-<dd>Content assist helps you finish tags and insert macros. Refer
-to the related task for more details.</dd>
+<dd>Content assist helps you finish tags and insert macros. Refer to the related
+task for more details.</dd>
<dt class="dlterm">Template</dt>
@@ -96,33 +96,19 @@
and entire tag sets to quickly update, copy, or remove content.</dd>
</dl>
-<p>To edit an XML file in the Source view, follow these steps:</p>
+<p>To open an XML file to edit, right-click the file in the
+Navigator view and select <span class="uicontrol">Open With > XML Editor</span>. Click
+the <span class="uicontrol">Source</span> to see the Source view.</p>
+<p>Edit the code
+as necessary, using any of the available features. As you move the cursor
+within your XML file (or select items from the Outline view), the node selection
+indicator will highlight the line numbers that encompass the node (for example,
+an element or attribute). You can use smart double-clicking behavior to select
+attribute values, attribute-value pairs, and entire tag sets to quickly update,
+copy, or remove content. If desired, validate and save the XML
+file.</p>
</div>
-<ol>
-<li class="stepexpand"><span>Open the XML file you want to work with in the XML editor (right-click
-the file in the Navigator view and click <span class="uicontrol">Open With > XML Editor</span>). </span>
- You might need to click the <span class="uicontrol">Source</span> tab. Typically,
-all that you will need to do to open the file is to double-click it in the
-Navigator view. If this does not work, right-click it and click <span class="uicontrol">Open
-With > XML Editor</span>.</li>
-
-<li class="stepexpand"><span>Edit the code as necessary, using any of the available features.</span>
- As you move the cursor within your XML file (or select items from the
-Outline view), the node selection indicator will highlight the line numbers
-that encompass the node (for example, an element or attribute). You can use
-smart double-clicking behavior to select attribute values, attribute-value
-pairs, and entire tag sets to quickly update, copy, or remove content.
-</li>
-
-<li class="stepexpand"><span>At intervals, you might wish to format individual nodes, or the
-entire XML file to restore element and attribute indentation to see nesting
-hierarchies more clearly in the file.</span></li>
-
-<li class="stepexpand"><span>If desired, validate and save the XML file.</span></li>
-
-</ol>
-
<div class="section"><p>Any changes you make in the Source view are also reflected in the
Design view and the Outline view.</p>
</div>
@@ -136,7 +122,7 @@
<div class="reltasks"><strong>Related tasks</strong><br />
<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
+<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
<div><a href="../topics/ttaghilt.html" title="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in.">Setting source highlighting styles</a></div>
</div>
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
index df24fd5..4a65ff0 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="txedttag" xml:lang="en-us">
<title>Editing XML files</title>
<titlealts>
@@ -9,23 +10,22 @@
<shortdesc>This file contains information about editing XML files.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>XML files</indexterm></indexterm>
-<indexterm>XML files<indexterm>editing</indexterm></indexterm>
-</keywords>
+<indexterm>XML files<indexterm>editing</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and click <menucascade><uicontrol>Open With</uicontrol><uicontrol>XML
+view and select <menucascade><uicontrol>Open With</uicontrol><uicontrol>XML
Editor</uicontrol></menucascade>. </p><p>We recommend working in the Resource
perspective when you are developing XML files. The views that appear by default
in this perspective (such as the Outline view) help facilitate XML development.</p><p>The
XML editor enables you to directly edit XML files. There are several different
views you can use to edit your files:</p><ul>
-<li><b>Source view</b> - you can manually insert, edit, and delete elements
+<li><b>Source view</b>: you can manually insert, edit, and delete elements
and attributes in the Source view of the XML editor. To facilitate this effort,
you can use content assist while you are in the Source view.</li>
-<li><b>Design view</b> - you can insert, delete, and edit elements, attributes,
+<li><b>Design view</b>: you can insert, delete, and edit elements, attributes,
comments, and processing instructions in this view.</li>
-<li><b>Outline view </b>- you can insert and delete elements attributes, comments,
+<li><b>Outline view</b>: you can insert and delete elements attributes, comments,
and processing instructions in this view.</li>
</ul><p>Often, you may find that you have more than one way to perform a specific
task. For example, you have an XML file "MySchoolSubjects.xml" associated
@@ -33,14 +33,15 @@
taught in a school. You want to insert a new element "Math" into your file.
You can do so in the following ways:</p><ul>
<li>In the Outline or Design view, right-click the appropriate parent element
-and select <uicontrol>Math</uicontrol> from the <uicontrol>Add Child</uicontrol> pop-up
-menu.</li>
+and select <menucascade><uicontrol>Add Child</uicontrol><uicontrol>Math</uicontrol>
+</menucascade> or <uicontrol>New Element</uicontrol> and enter the name of
+the child element<?Pub Caret?>.</li>
<li>In the Source view, use content assist to help you find the appropriate
location and code for the <uicontrol>Math</uicontrol> element.</li>
<li>In the Source view, type the code for the <uicontrol>Math</uicontrol> element
in the file.</li>
</ul></context>
-<postreq>The following links provide more information about the XML editor
-and editing XML files:</postreq>
+<postreq></postreq>
</taskbody>
</task>
+<?Pub *0000002530?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
index af6b692..178a1aa 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Editing XML files" />
<meta name="abstract" content="This file contains information about editing XML files." />
<meta name="description" content="This file contains information about editing XML files." />
-<meta content="XML files, editing, XML editor" name="DC.subject" />
-<meta content="XML files, editing, XML editor" name="keywords" />
+<meta content="XML editor, XML files, editing" name="DC.subject" />
+<meta content="XML editor, XML files, editing" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
@@ -33,7 +33,7 @@
<div><p>This file contains information about editing XML files.</p>
<div class="section"><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and click <span class="menucascade"><span class="uicontrol">Open With</span> > <span class="uicontrol">XML
+view and select <span class="menucascade"><span class="uicontrol">Open With</span> > <span class="uicontrol">XML
Editor</span></span>. </p>
<p>We recommend working in the Resource
perspective when you are developing XML files. The views that appear by default
@@ -42,14 +42,14 @@
XML editor enables you to directly edit XML files. There are several different
views you can use to edit your files:</p>
<ul>
-<li><strong>Source view</strong> - you can manually insert, edit, and delete elements
+<li><strong>Source view</strong>: you can manually insert, edit, and delete elements
and attributes in the Source view of the XML editor. To facilitate this effort,
you can use content assist while you are in the Source view.</li>
-<li><strong>Design view</strong> - you can insert, delete, and edit elements, attributes,
+<li><strong>Design view</strong>: you can insert, delete, and edit elements, attributes,
comments, and processing instructions in this view.</li>
-<li><strong>Outline view </strong>- you can insert and delete elements attributes, comments,
+<li><strong>Outline view</strong>: you can insert and delete elements attributes, comments,
and processing instructions in this view.</li>
</ul>
@@ -60,8 +60,9 @@
You can do so in the following ways:</p>
<ul>
<li>In the Outline or Design view, right-click the appropriate parent element
-and select <span class="uicontrol">Math</span> from the <span class="uicontrol">Add Child</span> pop-up
-menu.</li>
+and select <span class="menucascade"><span class="uicontrol">Add Child</span> > <span class="uicontrol">Math</span>
+</span> or <span class="uicontrol">New Element</span> and enter the name of
+the child element.</li>
<li>In the Source view, use content assist to help you find the appropriate
location and code for the <span class="uicontrol">Math</span> element.</li>
@@ -72,8 +73,7 @@
</ul>
</div>
-<div class="section">The following links provide more information about the XML editor
-and editing XML files:</div>
+<div class="section" />
</div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
index 828484f..015673f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<?Pub Inc?>
<task id="txmlcat" xml:lang="en-us">
<title>Adding entries to the XML Catalog</title>
@@ -8,10 +9,10 @@
<searchtitle>Adding entries to the XML Catalog</searchtitle>
</titlealts>
<shortdesc>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains
-information about a DTD or XML schema's location). You can place the Key in
-an XML file. When the XML processor encounters it, it will use the XML Catalog
-entry to find the location of the DTD or XML schema associated with the Key</shortdesc>
+a DTD or XML schema) and a Location (similar to a URI, which contains information
+about a DTD or XML schema's location). You can place the Key in an XML file.
+When the XML processor encounters it, it will use the XML Catalog entry to
+find the location of the DTD or XML schema associated with the Key</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML catalog<indexterm>adding entries</indexterm></indexterm>
</keywords>
@@ -35,81 +36,69 @@
(for example, <codeph>"http://www.ibm.com/published-schemas/MySchema.xsd"</codeph>)
so that it points to a resource on the developer's local machine (for example,
<codeph>"file:///C:/MySchema.xsd"</codeph>). Now, instead of frequently editing
-XML documents to update the URIs (especially when there are many documents
-in your project), you only need to update a single rule in your XML Catalog.</p><p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives.</p><p>To add an entry to the XML
-Catalog, follow these steps:</p></context>
+XML documents to update the URIs or locations (especially when there are many
+documents in your project), you only need to update a single rule in your
+XML Catalog.</p><p>The following instructions were written for the Resource
+perspective, but they will also work in many other perspectives.</p><p>To
+add an entry to the XML Catalog, follow these steps:</p></context>
<steps>
<step><cmd>Open the XML file that you want to associate with a DTD or XML
schema.</cmd></step>
<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-<uicontrol>Web and XML</uicontrol><uicontrol>XML Catalog</uicontrol></menucascade>.</cmd>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Catalog</uicontrol></menucascade>.</cmd><info>The <uicontrol>XML Catalog
+Entries</uicontrol> section contains a list of any user-defined and plug-in
+defined catalog entries. Select any entry to see information about it in the <uicontrol>Details</uicontrol> section.</info>
</step>
-<step><cmd>The <uicontrol>XML Catalog Entries</uicontrol> field contains
-a list of any user-defined and plug-in defined catalog entries.</cmd>
-<substeps>
-<substep><cmd>Select any entry to see details about it in the <uicontrol>Details</uicontrol> field. </cmd>
-</substep>
-<substep><cmd>Click <uicontrol>Add</uicontrol> to create a new catalog entry.</cmd>
-</substep>
-</substeps>
+<step><cmd>Click <uicontrol>Add</uicontrol> to create a new catalog entry.</cmd>
</step>
-<step><cmd>In the <uicontrol>URI</uicontrol> field, type the location of the
-DTD or XML schema or browse for it.</cmd></step>
-<step><cmd>If you specified a DTD in the <uicontrol>URI</uicontrol> field,
-you can select either <uicontrol>Public ID</uicontrol> or <uicontrol>System
-ID</uicontrol> from the <uicontrol>Key Type</uicontrol> field.</cmd><info>If
-you select <uicontrol>Public ID,</uicontrol> the value you enter in the <uicontrol>Key</uicontrol> field
+<step><cmd>In the <uicontrol>Location</uicontrol> field, enter or browse for
+the location or URI of the DTD or XML schema file. This uses your computer's
+path style to describe the location of the file.</cmd></step>
+<step><cmd>Select a key type for the catalog entry from the <uicontrol>Key
+Type</uicontrol> drop down.</cmd><info>The values in this list will change
+depending on the type of file you specified in the <uicontrol>Location</uicontrol> field:<ul>
+<li>If you specified a DTD: select <uicontrol>Public ID</uicontrol>, <uicontrol>System
+ID</uicontrol>, or <uicontrol>URI</uicontrol> from the <uicontrol>Key Type</uicontrol> field.
+If you select <uicontrol>Public ID,</uicontrol> the value you enter in the <uicontrol>Key</uicontrol> field
should be the same as the Public ID in the XML file's DOCTYPE declaration.
If you select <uicontrol>System ID</uicontrol>, the value you enter should
-correspond to the System ID in an XML file's DOCTYPE declaration.</info></step>
-<step><cmd>If you specified an XML schema in the <uicontrol>URI</uicontrol> field,
-you can select either <uicontrol>Namespace Name</uicontrol> or <uicontrol>Schema
-Location</uicontrol> from the <uicontrol>Key Type</uicontrol> field.</cmd>
-<info>If the schema defines a target namespace, it will automatically appear
-in the <uicontrol>Key</uicontrol> field. Otherwise, you can enter the schema
-location in the <uicontrol>Key</uicontrol> field.</info></step>
+correspond to the System ID in an XML file's DOCTYPE declaration. If you select <uicontrol>URI</uicontrol>,
+the value you enter must be a fully qualified URI.</li>
+<li>If you specified an XML schema: select either <uicontrol>Namespace Name</uicontrol> or
+ <uicontrol>Schema Location</uicontrol> from the <uicontrol>Key Type</uicontrol> field.
+If the schema defines a target namespace, it will automatically appear in
+the <uicontrol>Key</uicontrol> field. Otherwise, you can enter the schema
+location in the <uicontrol>Key</uicontrol> field.</li>
+</ul></info></step>
<step><cmd>Select the <uicontrol>Specify alternative Web address</uicontrol> check
box if you want to be able to specify an alternate Web address for the resource.</cmd>
<info>This Web address is used when an XML instance is generated from this
-catalog entry. <b>Note</b>: This option is only available if you select <uicontrol>Public
+catalog entry.<note>This option is only available if you select <uicontrol>Public
ID</uicontrol> (for a DTD) or <uicontrol>Namespace Name</uicontrol> (for
-a schema) in the <uicontrol>Key type</uicontrol> field.</info></step>
+a schema) in the <uicontrol>Key type</uicontrol> field.</note></info></step>
<step><cmd>If you want to refer to another catalog without importing it into
the workbench, click <uicontrol>Next Catalog</uicontrol>. Type or browse for
the XML catalog you want to refer to. </cmd></step>
<step><cmd>When you are done creating catalog entries, click <uicontrol>OK</uicontrol> to
-close the Add XML Catalog Entry dialog. </cmd></step>
-<step><cmd>Click <uicontrol>Advanced</uicontrol> if you want to import or
-export any XML Catalog settings.</cmd></step>
-<step><cmd>Click <uicontrol>Export</uicontrol> if you want to persist the
-XML Catalog information. Only your user specified entries will be exported.</cmd>
-<substeps>
-<substep><cmd>You will be prompted to select a project and provide a file
-name to store your catalog entries in an .xmlcatalog file, which can be opened
-from the Navigator view. Snce your catalog entries are stored in an .xmlcatalog
-file, you can check them in and out and share them like any other project
-resource. </cmd></substep>
-<substep><cmd>Click <uicontrol>OK</uicontrol>.</cmd></substep>
-</substeps>
-</step>
-<step><cmd>Click <uicontrol>Import</uicontrol> if you want to import an .xmlcatalog
-file. You will be prompted to select the file you want to import.</cmd>
-<substeps>
-<substep><cmd>When you import a .xmlcatalog file, any entries in it will be
-loaded into the XML Catalog (and any existing entries will be overwritten). </cmd>
-</substep>
-<substep><cmd>Click <uicontrol>OK</uicontrol>.</cmd></substep>
-</substeps>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol> to close the Advanced XML Catalog
-Preferences dialog.</cmd></step>
+close the Add XML Catalog Entry dialog. Click <uicontrol>OK</uicontrol> again
+to save your settings.</cmd></step>
<step><cmd>Make sure the XML file is in focus and click the <uicontrol>Reload
dependencies</uicontrol> toolbar button. </cmd></step>
</steps>
<result>The XML file is now associated with the latest version of the XML
schema or DTD.</result>
+<postreq><p>You can also export and import XML Catalog information:<?Pub Caret?> </p><p>To
+export, click <uicontrol>File > Export</uicontrol> and select <uicontrol>XML
+> XML Catalog</uicontrol>. You will be prompted to select a project and provide
+a file name to store your catalog entries in an .xmlcatalog file, which can
+be opened from the Navigator view. Since your catalog entries are stored in
+an .xmlcatalog file, you can check them in and out and share them like any
+other project resource.</p><p>To import, click <uicontrol>File > Import</uicontrol> and
+select <uicontrol>XML > XML Catalog</uicontrol>. Then specify the file that
+will be used to load the XML Catalog settings. When you import a .xmlcatalog
+file, any entries in it will be loaded into the XML Catalog (and any existing
+entries will be overwritten). </p></postreq>
</taskbody>
</task>
-<?Pub *0000007087?>
+<?Pub *0000006868?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
index 2d172b4..025015b 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Adding entries to the XML Catalog" />
-<meta name="abstract" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta name="description" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta content="XML catalog, adding entries, importing entries, exporting entries" name="DC.subject" />
-<meta content="XML catalog, adding entries, importing entries, exporting entries" name="keywords" />
+<meta name="abstract" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
+<meta name="description" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
+<meta content="XML catalog, adding entries" name="DC.subject" />
+<meta content="XML catalog, adding entries" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
@@ -36,10 +36,10 @@
<div><p>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a Uniform Resource Identifier (URI) (which contains
-information about a DTD or XML schema's location). You can place the Key in
-an XML file. When the XML processor encounters it, it will use the XML Catalog
-entry to find the location of the DTD or XML schema associated with the Key</p>
+a DTD or XML schema) and a Location (similar to a URI, which contains information
+about a DTD or XML schema's location). You can place the Key in an XML file.
+When the XML processor encounters it, it will use the XML Catalog entry to
+find the location of the DTD or XML schema associated with the Key</p>
<div class="section"><p>XML Catalog entries can be used in various situations. For example,
you are working on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
@@ -60,13 +60,13 @@
(for example, <samp class="codeph">"http://www.ibm.com/published-schemas/MySchema.xsd"</samp>)
so that it points to a resource on the developer's local machine (for example,
<samp class="codeph">"file:///C:/MySchema.xsd"</samp>). Now, instead of frequently editing
-XML documents to update the URIs (especially when there are many documents
-in your project), you only need to update a single rule in your XML Catalog.</p>
-<p>The
-following instructions were written for the Resource perspective, but they
-will also work in many other perspectives.</p>
-<p>To add an entry to the XML
-Catalog, follow these steps:</p>
+XML documents to update the URIs or locations (especially when there are many
+documents in your project), you only need to update a single rule in your
+XML Catalog.</p>
+<p>The following instructions were written for the Resource
+perspective, but they will also work in many other perspectives.</p>
+<p>To
+add an entry to the XML Catalog, follow these steps:</p>
</div>
<ol>
@@ -74,87 +74,54 @@
schema.</span></li>
<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
- > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Catalog</span></span>.</span>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Catalog</span></span>.</span> The <span class="uicontrol">XML Catalog
+Entries</span> section contains a list of any user-defined and plug-in
+defined catalog entries. Select any entry to see information about it in the <span class="uicontrol">Details</span> section.
</li>
-<li class="stepexpand"><span>The <span class="uicontrol">XML Catalog Entries</span> field contains
-a list of any user-defined and plug-in defined catalog entries.</span>
-<ol type="a">
-<li><span>Select any entry to see details about it in the <span class="uicontrol">Details</span> field. </span>
+<li class="stepexpand"><span>Click <span class="uicontrol">Add</span> to create a new catalog entry.</span>
</li>
-<li><span>Click <span class="uicontrol">Add</span> to create a new catalog entry.</span>
-</li>
+<li class="stepexpand"><span>In the <span class="uicontrol">Location</span> field, enter or browse for
+the location or URI of the DTD or XML schema file. This uses your computer's
+path style to describe the location of the file.</span></li>
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">URI</span> field, type the location of the
-DTD or XML schema or browse for it.</span></li>
-
-<li class="stepexpand"><span>If you specified a DTD in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span> from the <span class="uicontrol">Key Type</span> field.</span> If
-you select <span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
+<li class="stepexpand"><span>Select a key type for the catalog entry from the <span class="uicontrol">Key
+Type</span> drop down.</span> The values in this list will change
+depending on the type of file you specified in the <span class="uicontrol">Location</span> field:<ul>
+<li>If you specified a DTD: select <span class="uicontrol">Public ID</span>, <span class="uicontrol">System
+ID</span>, or <span class="uicontrol">URI</span> from the <span class="uicontrol">Key Type</span> field.
+If you select <span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
should be the same as the Public ID in the XML file's DOCTYPE declaration.
If you select <span class="uicontrol">System ID</span>, the value you enter should
-correspond to the System ID in an XML file's DOCTYPE declaration.</li>
+correspond to the System ID in an XML file's DOCTYPE declaration. If you select <span class="uicontrol">URI</span>,
+the value you enter must be a fully qualified URI.</li>
-<li class="stepexpand"><span>If you specified an XML schema in the <span class="uicontrol">URI</span> field,
-you can select either <span class="uicontrol">Namespace Name</span> or <span class="uicontrol">Schema
-Location</span> from the <span class="uicontrol">Key Type</span> field.</span>
- If the schema defines a target namespace, it will automatically appear
-in the <span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
+<li>If you specified an XML schema: select either <span class="uicontrol">Namespace Name</span> or
+ <span class="uicontrol">Schema Location</span> from the <span class="uicontrol">Key Type</span> field.
+If the schema defines a target namespace, it will automatically appear in
+the <span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
location in the <span class="uicontrol">Key</span> field.</li>
+</ul>
+</li>
+
<li class="stepexpand"><span>Select the <span class="uicontrol">Specify alternative Web address</span> check
box if you want to be able to specify an alternate Web address for the resource.</span>
This Web address is used when an XML instance is generated from this
-catalog entry. <strong>Note</strong>: This option is only available if you select <span class="uicontrol">Public
+catalog entry.<div class="note"><span class="notetitle">Note:</span> This option is only available if you select <span class="uicontrol">Public
ID</span> (for a DTD) or <span class="uicontrol">Namespace Name</span> (for
-a schema) in the <span class="uicontrol">Key type</span> field.</li>
+a schema) in the <span class="uicontrol">Key type</span> field.</div>
+</li>
<li class="stepexpand"><span>If you want to refer to another catalog without importing it into
the workbench, click <span class="uicontrol">Next Catalog</span>. Type or browse for
the XML catalog you want to refer to. </span></li>
<li class="stepexpand"><span>When you are done creating catalog entries, click <span class="uicontrol">OK</span> to
-close the Add XML Catalog Entry dialog. </span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Advanced</span> if you want to import or
-export any XML Catalog settings.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Export</span> if you want to persist the
-XML Catalog information. Only your user specified entries will be exported.</span>
-<ol type="a">
-<li><span>You will be prompted to select a project and provide a file
-name to store your catalog entries in an .xmlcatalog file, which can be opened
-from the Navigator view. Snce your catalog entries are stored in an .xmlcatalog
-file, you can check them in and out and share them like any other project
-resource. </span></li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Import</span> if you want to import an .xmlcatalog
-file. You will be prompted to select the file you want to import.</span>
-<ol type="a">
-<li><span>When you import a .xmlcatalog file, any entries in it will be
-loaded into the XML Catalog (and any existing entries will be overwritten). </span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to close the Advanced XML Catalog
-Preferences dialog.</span></li>
+close the Add XML Catalog Entry dialog. Click <span class="uicontrol">OK</span> again
+to save your settings.</span></li>
<li class="stepexpand"><span>Make sure the XML file is in focus and click the <span class="uicontrol">Reload
dependencies</span> toolbar button. </span></li>
@@ -164,13 +131,28 @@
<div class="section">The XML file is now associated with the latest version of the XML
schema or DTD.</div>
+<div class="section"><p>You can also export and import XML Catalog information: </p>
+<p>To
+export, click <span class="uicontrol">File > Export</span> and select <span class="uicontrol">XML
+> XML Catalog</span>. You will be prompted to select a project and provide
+a file name to store your catalog entries in an .xmlcatalog file, which can
+be opened from the Navigator view. Since your catalog entries are stored in
+an .xmlcatalog file, you can check them in and out and share them like any
+other project resource.</p>
+<p>To import, click <span class="uicontrol">File > Import</span> and
+select <span class="uicontrol">XML > XML Catalog</span>. Then specify the file that
+will be used to load the XML Catalog settings. When you import a .xmlcatalog
+file, any entries in it will be loaded into the XML Catalog (and any existing
+entries will be overwritten). </p>
+</div>
+
</div>
<div><div class="relconcepts"><strong>Related concepts</strong><br />
<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
</div>
<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints (that is, a set of rules) defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
+<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML > Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
index 1fa7ac5..b9d9ffd 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<task id="txprefs" xml:lang="en-us">
@@ -9,24 +9,26 @@
</titlealts>
<shortdesc>You can set various preferences for the Source view of the XML
editor such as the formatter indentation style, line wrapping rules, and content
-assist rules. To apply the formatting styles, right-click in in the Source
-view for your XML document, and click <menucascade><uicontrol>Format</uicontrol>
+assist rules. To apply the formatting styles, right-click in the Source view
+for your XML document, and click <menucascade><uicontrol>Format</uicontrol>
<uicontrol>Document</uicontrol></menucascade>.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>preferences</indexterm></indexterm>
-<indexterm>preferences<indexterm>XML editor</indexterm></indexterm>
-</keywords>
+<indexterm>preferences<indexterm>XML editor</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
-<context><p>To define XML preferences, perform the following steps:</p></context>
+<context><p>To define XML preferences, complete the following steps:</p></context>
<steps>
<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-<uicontrol>Web and XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML
-Source</uicontrol></menucascade>.</cmd></step>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files</uicontrol><uicontrol>Editor</uicontrol></menucascade>.</cmd></step>
<step><cmd>Enter a maximum width for formatted lines in the <uicontrol>Line
width</uicontrol> field</cmd><info>The default value is 72.</info></step>
<step><cmd>Select <uicontrol>Split multiple attributes each on a new line</uicontrol> to
start every attribute on a new line.</cmd></step>
+<step><cmd>Select <uicontrol>Preserve whitespace in tags with PCDATA content</uicontrol> to
+prevent the editor from deleting whitespace in elements that contain parsed
+character data.</cmd></step>
<step><cmd>If you want blank lines to be removed when the document is formatted,
select the <uicontrol>Clear all blank lines</uicontrol> check box. </cmd>
<info>By default, blank lines are preserved in a formatted document.</info>
@@ -38,11 +40,11 @@
<step><cmd>You can also specify the <uicontrol>Indentation size</uicontrol> which
is the number of tabs or space characters used for formatting indentation.</cmd>
</step>
-<step><cmd>You can specify certain characters ('<' is default) that will
-cause the content assist list to pop up automatically. Ensure the <uicontrol>Automatically
-make suggestions</uicontrol> check box is selected and specify the characters
-in the <uicontrol>Prompt when these characters are inserted</uicontrol> field. </cmd>
-</step>
+<step><cmd>You can specify certain characters (the default command<?Pub Caret?>
+is <=) that will cause the content assist list to pop up automatically.
+Ensure the <uicontrol>Automatically make suggestions</uicontrol> check box
+is selected and specify the characters in the <uicontrol>Prompt when these
+characters are inserted</uicontrol> field. </cmd></step>
<step><cmd>If you select <b>Strict</b> from the <b>Suggestion strategy</b> list,
suggestions that are grammatically valid will be shown first (with bold icons)
in the content assist list. Other suggestions that are applicable to the element
@@ -58,3 +60,4 @@
</steps>
</taskbody>
</task>
+<?Pub *0000003659?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
index c14d8f9..466eaaa 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
@@ -2,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
<meta name="DC.Title" content="Defining XML editor preferences" />
-<meta name="abstract" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in in the Source view for your XML document, and click Format > Document." />
-<meta name="description" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in in the Source view for your XML document, and click Format > Document." />
-<meta content="XML editor, setting, line wrapping rules, content assist rules, indentation style" name="DC.subject" />
-<meta content="XML editor, setting, line wrapping rules, content assist rules, indentation style" name="keywords" />
+<meta name="abstract" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in the Source view for your XML document, and click Format > Document." />
+<meta name="description" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in the Source view for your XML document, and click Format > Document." />
+<meta content="XML editor, preferences" name="DC.subject" />
+<meta content="XML editor, preferences" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="txprefs" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -29,17 +29,17 @@
<div><p>You can set various preferences for the Source view of the XML
editor such as the formatter indentation style, line wrapping rules, and content
-assist rules. To apply the formatting styles, right-click in in the Source
-view for your XML document, and click <span class="menucascade"><span class="uicontrol">Format</span>
+assist rules. To apply the formatting styles, right-click in the Source view
+for your XML document, and click <span class="menucascade"><span class="uicontrol">Format</span>
> <span class="uicontrol">Document</span></span>.</p>
-<div class="section"><p>To define XML preferences, perform the following steps:</p>
+<div class="section"><p>To define XML preferences, complete the following steps:</p>
</div>
<ol>
<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
- > <span class="uicontrol">Web and XML</span> > <span class="uicontrol">XML Files</span> > <span class="uicontrol">XML
-Source</span></span>.</span></li>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> > <span class="uicontrol">XML
+Files</span> > <span class="uicontrol">Editor</span></span>.</span></li>
<li class="stepexpand"><span>Enter a maximum width for formatted lines in the <span class="uicontrol">Line
width</span> field</span> The default value is 72.</li>
@@ -47,6 +47,10 @@
<li class="stepexpand"><span>Select <span class="uicontrol">Split multiple attributes each on a new line</span> to
start every attribute on a new line.</span></li>
+<li class="stepexpand"><span>Select <span class="uicontrol">Preserve whitespace in tags with PCDATA content</span> to
+prevent the editor from deleting whitespace in elements that contain parsed
+character data.</span></li>
+
<li class="stepexpand"><span>If you want blank lines to be removed when the document is formatted,
select the <span class="uicontrol">Clear all blank lines</span> check box. </span>
By default, blank lines are preserved in a formatted document.
@@ -61,11 +65,11 @@
is the number of tabs or space characters used for formatting indentation.</span>
</li>
-<li class="stepexpand"><span>You can specify certain characters ('<' is default) that will
-cause the content assist list to pop up automatically. Ensure the <span class="uicontrol">Automatically
-make suggestions</span> check box is selected and specify the characters
-in the <span class="uicontrol">Prompt when these characters are inserted</span> field. </span>
-</li>
+<li class="stepexpand"><span>You can specify certain characters (the default command
+is <=) that will cause the content assist list to pop up automatically.
+Ensure the <span class="uicontrol">Automatically make suggestions</span> check box
+is selected and specify the characters in the <span class="uicontrol">Prompt when these
+characters are inserted</span> field. </span></li>
<li class="stepexpand"><span>If you select <strong>Strict</strong> from the <strong>Suggestion strategy</strong> list,
suggestions that are grammatically valid will be shown first (with bold icons)
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
index 15a6bda..32ed973 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
<task id="txsityp" xml:lang="en-us">
<title>Using xsi:type</title>
<titlealts>
@@ -11,31 +12,40 @@
and any other complex types derived from it.</shortdesc>
<taskbody>
<context><p>The XML Schema specification allows you to derive types by extension.
-For example, you have an XML schema and you create a complex type for it called
- <userinput>Address</userinput>. You then add some basic elements to <userinput>Address</userinput>,
-such as <userinput>streetName</userinput> and <userinput>city</userinput>.</p><p>After
-this, you derive (by extension) two new complex types from <userinput>Address</userinput> - <userinput>USAddress</userinput> and <userinput>UKAddress</userinput
-> You add a new element to <userinput>USAddress</userinput> called <userinput>state</userinput>,
-and also a new element to <userinput>UKAddress</userinput> called <userinput>postcode</userinput>.</p><p>After
-you have done this, you create two more elements - <userinput>billTo</userinput> and <userinput>shipTo</userinput> -
-as <systemoutput>Address</systemoutput> types.</p><p>When you create an XML
-instance document for an element such as <systemoutput>billTo</systemoutput> or
- <userinput>Address</userinput>, an xsi:type attribute will automatically
-be added to it. For example:</p><codeblock><billTo xsi:type="ipo:Address"></codeblock><p>The
+See the following steps as an example<?Pub Caret?>:</p></context>
+<steps>
+<step><cmd>Create an XML schema and create a complex type for it called <userinput>Address</userinput>. </cmd>
+</step>
+<step><cmd>Add some basic elements to <userinput>Address</userinput>, such
+as <userinput>streetName</userinput> and <userinput>city</userinput>.</cmd>
+</step>
+<step><cmd>Derive (by extension) two new complex types from <userinput>Address</userinput>: <userinput>USAddress</userinput> and <userinput>UKAddress</userinput
+>. </cmd></step>
+<step><cmd>Add a new element to <userinput>USAddress</userinput> called <userinput>state</userinput>,
+and also a new element to <userinput>UKAddress</userinput> called <userinput>postcode</userinput>.</cmd>
+</step>
+<step><cmd>Create two more elements: <userinput>billTo</userinput> and <userinput>shipTo</userinput>,
+as <systemoutput>Address</systemoutput> types.</cmd></step>
+<step><cmd>When you create an XML instance document for an element such as
+ <systemoutput>billTo</systemoutput> or <userinput>Address</userinput>, an
+xsi:type attribute will automatically be added to it.</cmd><info>For example, <codeblock><billTo xsi:type="ipo:Address"></codeblock>The
xsi:type attribute is used to identify derived complex types (as well as complex
-types that have been derived from).</p><p>In the Design view of the XML editor,
-a list will be available, letting you select the appropriate type definition
-(<uicontrol>Address</uicontrol>, <uicontrol>USAddress</uicontrol>, or <uicontrol>UKAddress</uicontrol>).
-The guided editing for the content model will reflect the type definition
-that you choose. For example, if you select <uicontrol>USAddress</uicontrol> ,
-your <codeph>billTo</codeph> element can contain a <codeph>state</codeph> element,
-but it cannot contain a <codeph>postcode</codeph> element.</p><p>The XML example
-"Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p><p>For
+types that have been derived from).</info></step>
+<step><cmd>In the Design view of the XML editor, a list will be available,
+letting you select the appropriate type definition (<uicontrol>Address</uicontrol>, <uicontrol>USAddress</uicontrol>,
+or <uicontrol>UKAddress</uicontrol>). The guided editing for the content
+model will reflect the type definition that you choose. For example, if you
+select <uicontrol>USAddress</uicontrol> , your <codeph>billTo</codeph> element
+can contain a <codeph>state</codeph> element, but it cannot contain a <codeph>postcode</codeph> element.</cmd>
+</step>
+</steps>
+<postreq><p>The XML example "Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p><p>For
more information about xsi:type, refer to the <b>Using Derived Types in Instance
Documents</b> section in <xref format="html" href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs"
scope="external">XML Schema Part 0: Primer.</xref></p><p>For more information
about validation semantics when xsi:type is used, refer to the <b>Schema-Related
Markup in Documents Being Validated</b> section in <xref format="html" href="http://www.w3.org/TR/xmlschema-1/#xsi_type"
-scope="external">XML Schema Part 1: Structures</xref> </p></context>
+scope="external">XML Schema Part 1: Structures</xref> </p></postreq>
</taskbody>
</task>
+<?Pub *0000003154?>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
index 87ed2c6..dfc4641 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -29,32 +29,44 @@
and any other complex types derived from it.</p>
<div class="section"><p>The XML Schema specification allows you to derive types by extension.
-For example, you have an XML schema and you create a complex type for it called
- <kbd class="userinput">Address</kbd>. You then add some basic elements to <kbd class="userinput">Address</kbd>,
-such as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>.</p>
-<p>After
-this, you derive (by extension) two new complex types from <kbd class="userinput">Address</kbd> - <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd> You add a new element to <kbd class="userinput">USAddress</kbd> called <kbd class="userinput">state</kbd>,
-and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</p>
-<p>After
-you have done this, you create two more elements - <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd> -
-as <tt class="sysout">Address</tt> types.</p>
-<p>When you create an XML
-instance document for an element such as <tt class="sysout">billTo</tt> or
- <kbd class="userinput">Address</kbd>, an xsi:type attribute will automatically
-be added to it. For example:</p>
-<pre><billTo xsi:type="ipo:Address"></pre>
-<p>The
+See the following steps as an example:</p>
+</div>
+
+<ol>
+<li class="stepexpand"><span>Create an XML schema and create a complex type for it called <kbd class="userinput">Address</kbd>. </span>
+</li>
+
+<li class="stepexpand"><span>Add some basic elements to <kbd class="userinput">Address</kbd>, such
+as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>.</span>
+</li>
+
+<li class="stepexpand"><span>Derive (by extension) two new complex types from <kbd class="userinput">Address</kbd>: <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd>. </span></li>
+
+<li class="stepexpand"><span>Add a new element to <kbd class="userinput">USAddress</kbd> called <kbd class="userinput">state</kbd>,
+and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</span>
+</li>
+
+<li class="stepexpand"><span>Create two more elements: <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd>,
+as <tt class="sysout">Address</tt> types.</span></li>
+
+<li class="stepexpand"><span>When you create an XML instance document for an element such as
+ <tt class="sysout">billTo</tt> or <kbd class="userinput">Address</kbd>, an
+xsi:type attribute will automatically be added to it.</span> For example, <pre><billTo xsi:type="ipo:Address"></pre>
+The
xsi:type attribute is used to identify derived complex types (as well as complex
-types that have been derived from).</p>
-<p>In the Design view of the XML editor,
-a list will be available, letting you select the appropriate type definition
-(<span class="uicontrol">Address</span>, <span class="uicontrol">USAddress</span>, or <span class="uicontrol">UKAddress</span>).
-The guided editing for the content model will reflect the type definition
-that you choose. For example, if you select <span class="uicontrol">USAddress</span> ,
-your <samp class="codeph">billTo</samp> element can contain a <samp class="codeph">state</samp> element,
-but it cannot contain a <samp class="codeph">postcode</samp> element.</p>
-<p>The XML example
-"Editing and validating XML files" demonstrates <strong>xsi:type</strong> support.</p>
+types that have been derived from).</li>
+
+<li class="stepexpand"><span>In the Design view of the XML editor, a list will be available,
+letting you select the appropriate type definition (<span class="uicontrol">Address</span>, <span class="uicontrol">USAddress</span>,
+or <span class="uicontrol">UKAddress</span>). The guided editing for the content
+model will reflect the type definition that you choose. For example, if you
+select <span class="uicontrol">USAddress</span> , your <samp class="codeph">billTo</samp> element
+can contain a <samp class="codeph">state</samp> element, but it cannot contain a <samp class="codeph">postcode</samp> element.</span>
+</li>
+
+</ol>
+
+<div class="section"><p>The XML example "Editing and validating XML files" demonstrates <strong>xsi:type</strong> support.</p>
<p>For
more information about xsi:type, refer to the <strong>Using Derived Types in Instance
Documents</strong> section in <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
