[310222] [310216] updates to XML docs for 3.2
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
index 4d930bc..32bd50e 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xmleditor.doc.user; singleton:=true
-Bundle-Version: 1.0.600.qualifier
+Bundle-Version: 1.0.700.qualifier
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
index da5fafa..6a73a88 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
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 82985d3..fbc70c9 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2008, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Sty _display FontColor="red"?>
<task id="tedtsch" xml:lang="en-us">
<title>Editing namespace information</title>
<titlealts>
@@ -9,48 +10,52 @@
</titlealts>
<shortdesc>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.</shortdesc>
+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.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>namespace information</indexterm></indexterm>
<indexterm>XML files<indexterm>namespace information</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 your schema
-information, complete the following steps:</p></context>
+<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, 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>
-<step><cmd>Your XML file can be associated with more than one namespace or
-schema.</cmd><info>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</info>
+<step><cmd>In the Design view of the XML editor, right-click your
+root element and click <uicontrol>Edit Namespaces</uicontrol>.</cmd>
</step>
-<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. For
-more information, see <xref format="html" href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"
+<step><cmd>Your XML file can be associated with more than one namespace
+or schema.</cmd><info>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</info>
+</step>
+<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. For more information, see <xref
+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><cmd>All qualified elements and attributes in the XM<?Pub Caret?>L
+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 the XML file is associated with.</cmd><info>An XML Catalog
-Key or a namespace name can be specified in this field. Click <uicontrol>Browse</uicontrol> to
-view all XML schemas in the workbench and XML Catalog.</info></step>
+<step><cmd>The <uicontrol>Location Hint</uicontrol> field contains
+the location of the XML schema the XML file is associated with.</cmd>
+<info>An XML Catalog Key or a namespace name can be specified in this
+field. Click <uicontrol>Browse</uicontrol> to view all XML schemas
+in the workbench and XML Catalog.</info></step>
<step><cmd>Click <uicontrol>OK</uicontrol>, then click <uicontrol>OK</uicontrol> again.</cmd>
</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 select the <uicontrol>Specify
-From Registered Namespace</uicontrol> radio button and select the namespace
-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
-Namespaces</uicontrol> to add it. If you do not have a root element, you must
-create one before you can add the namespace information.</postreq>
+From Registered Namespace</uicontrol> radio button and select the
+namespace 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
+Namespaces</uicontrol> to add it. If you do not have a root element,
+you must create one before you can add the namespace information.</postreq>
</taskbody>
</task>
+<?Pub *0000003288?>
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 0e94754..f29a64a 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<?Pub Inc?>
@@ -8,43 +8,50 @@
<titlealts>
<searchtitle>Using XML content assist</searchtitle>
</titlealts>
-<shortdesc>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.</shortdesc>
+<shortdesc>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.</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
-for the content assist to offer suggestions for completion.</p><p>You can
-launch content assist in either of the following ways:</p><ul>
-<li>From the <uicontrol>Edit</uicontrol> menu, click <uicontrol>Content Assist</uicontrol>,
-or</li>
+<context><p>The placement of the cursor in your source file provides
+the context for the content assist to offer suggestions for completion.</p><p>You
+can launch content assist in either of the following ways:</p><ul>
+<li>From the <uicontrol>Edit</uicontrol> menu, click <uicontrol>Content
+Assist</uicontrol>, or</li>
<li>Press Ctrl+Space</li>
-</ul><p>In addition, you can set up an option that causes content assist to
-pop up automatically when certain characters are typed. To set up this option,
-click <menucascade><uicontrol>Window</uicontrol><uicontrol> Preferences</uicontrol>
-</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
+</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 select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Files </uicontrol><uicontrol>Editor</uicontrol><uicontrol>Content
+assist</uicontrol></menucascade> . 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>Content
+assist cycling is available in the XML editor, offering multiple pages
+of content assist. You can set preferences for the proposal categories
+and the cycle order when repeatedly invoking content assist </p><?Pub
+Caret 53?><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><note>The list only refreshes as described
+if you first type <userinput><</userinput> before prompting for
content assist.</note></context>
</taskbody>
</task>
-<?Pub *0000002891?>
+<?Pub *0000003092?>
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 620e459..1de5f51 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
@@ -1,47 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Sty _display FontColor="red"?>
<task id="txedtdes" xml:lang="en-us">
<title>Editing in the Design view</title>
<titlealts>
<searchtitle>Editing in the Design view</searchtitle>
</titlealts>
-<shortdesc>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.</shortdesc>
+<shortdesc>The XML editor has a Design view, which represents the
+XML file simultaneously as a table with Node and Content columns 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.</shortdesc>
<prolog><metadata>
<keywords><indexterm>XML editor<indexterm>Design view</indexterm></indexterm>
</keywords>
</metadata></prolog>
<taskbody>
-<context><p>For example, the <uicontrol>Add child</uicontrol> menu item will
-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,
-which is why the Design view can provide prompts (via a pop-up menu) for those
-tags. When you create an XML file that is not associated with an XML schema
-or DTD file, it has no tags or rules associated with it, so the Design view
-cannot provide prompts for specific tags, but it can provide prompts to create
-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>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
-All</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:</p><table>
-<tgroup cols="2"><colspec colname="col1" colwidth="48*"/><colspec colname="col2"
-colwidth="150*"/>
+<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, which is why the Design
+view can provide prompts (via a pop-up menu) for those tags. When
+you create an XML file that is not associated with an XML schema or
+DTD file, it has no tags or rules associated with it, so the Design
+view cannot provide prompts for specific tags, but it can provide
+prompts to create 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>To open and edit
+a XML file in the XML editor, right-click the file in the Project
+Explorer view and click <uicontrol>Open With > XML Editor</uicontrol>.
+If necessary, click the <uicontrol>Design</uicontrol> tab to open
+the Design view.</p><?Pub Caret 92?><p>To expand all the items in
+your XML file, click the <uicontrol>Expand All</uicontrol> button<image
+href="../images/expand_all.gif"><alt>This graphic is the Expand All
+button</alt></image> on the top right corner of the editor. To collapse
+them, click the <uicontrol>Collapse All</uicontrol> button<image
+href="../images/collapse_all.gif"><alt>This graphic is the Collapse
+All button</alt></image> on the top right corner of the editor.</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:</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>
@@ -55,75 +61,80 @@
</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="dita" href="tedtdoc.dita"
-scope="local">Editing DOCTYPE declarations</xref>.</entry>
+<entry colname="col2">Edit the DOCTYPE declaration. Refer to the related
+task for more details. For more information, see <xref format="dita"
+href="tedtdoc.dita" scope="local">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="dita" href="tedtsch.dita" scope="local">Editing
-namespace information</xref>.</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="dita"
+href="tedtsch.dita" scope="local">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="dita" href="tedtproc.dita"
-scope="local">Editing XML processing instructions</xref>.</entry>
+<entry colname="col2">Edit the processing instruction. Refer to the
+related task for more details. For more information, see <xref
+format="dita" href="tedtproc.dita" scope="local">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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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><note>These instructions were written
-for the Resource perspective, but they will also work in many other perspectives.</note></result>
+<result><p>Any changes you make in the Design view are also reflected
+in the 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 *0000006781?>
