diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
index 2328cbc..60b1bfa 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
 <?Pub Inc?>
 <concept id="workingwithxmlschemas" xml:lang="en-us">
 <title>Working with XML schemas</title>
-<shortdesc>This sections contains information on the following:</shortdesc>
-<conbody></conbody>
+<shortdesc>XML schemas are an XML language for describing and constraining
+the content of XML files.</shortdesc>
+<conbody>
+<p>This sections contains information on the following:</p><?Pub Caret1?>
+</conbody>
 <related-links>
 <link href="tcxmlsch.dita"><linktext>Creating XML schemas</linktext></link>
 <link href="timpschm.dita"><linktext>Importing XML schemas</linktext></link>
 <link href="tnavsrc.dita"><linktext>Navigating XML schemas</linktext></link>
-<link href="trefactrXSD.dita"><?Pub Caret?><linktext>Refactoring in XML schemas</linktext>
+<link href="trefactrXSD.dita"><linktext>Refactoring in XML schemas</linktext>
 </link>
 <link href="tedtpref.dita"><linktext>Editing XML schema file preferences</linktext>
 </link>
@@ -22,4 +26,4 @@
 <link href="rnmspc.dita"><linktext>XML namespaces</linktext></link>
 </related-links>
 </concept>
-<?Pub *0000001174?>
+<?Pub *0000001267?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
index a10971f..60b4ae4 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
 <concept id="cxmlsced" xml:lang="en-us">
 <title>XML schema editor</title>
 <titlealts>
 <searchtitle>XML schema editor</searchtitle>
 </titlealts>
-<shortdesc>XML schemas are an XML language for describing and constraining
-the content of XML files.</shortdesc>
+<shortdesc>This product provides an XML schema editor for creating, viewing,
+and validating XML schemas. X<?Pub Caret1?>ML schemas are a formal specification
+of element names that indicates which elements are allowed in an XML file,
+and in which combinations. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>overview</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
-<p>XML schemas are a formal specification of element names that indicates
-which elements are allowed in an XML file, and in which combinations. A schema
-is functionally equivalent to a DTD, but is written in XML; a schema also
-provides for extended functionality such as data typing, inheritance, and
-presentation rules.</p>
+<p>A schema is functionally equivalent to a DTD, but is written in XML; a
+schema also provides for extended functionality such as data typing, inheritance,
+and presentation rules.</p>
 <p>For more information on XML schema, refer to:</p>
 <ul>
 <li> <xref format="html" href="http://www.w3.org/TR/xmlschema-0/" scope="external">http://www.w3.org/TR/xmlschema-0/</xref> </li>
 <li> <xref format="html" href="http://www.w3.org/TR/xmlschema-1/" scope="external">http://www.w3.org/TR/xmlschema-1/</xref> </li>
 <li> <xref format="html" href="http://www.w3.org/TR/xmlschema-2/" scope="external">http://www.w3.org/TR/xmlschema-2/</xref> </li>
 </ul>
-<p>This product provides an XML schema editor for creating, viewing, and validating
-XML schemas. Using the XML schema editor, you can:</p>
+<p>Using the XML schema editor, you can:</p>
 <ul>
 <li>Create and delete XML schema components such as complex types, simple
 types, elements, attributes, attribute groups, and groups.</li>
@@ -33,10 +33,10 @@
 <li>Import existing XML schemas for structured viewing.</li>
 </ul>
 <p>The XML Schema specification from the W3C Web site is used for validation.</p>
-<section><title>XML schema editor views - Graph, Outline, Properties, and
+<section><title>XML schema editor views - Design, Outline, Properties, and
 Source</title>There are four main views you can work with in the XML schema
 editor:<ul>
-<li>Graph - the Graph view provides a graphical way to edit your schema</li>
+<li>Design - the Design view provides a graphical way to edit your schema</li>
 <li>Outline - the Outline view shows you the main components in your XML schema.
 You can use this view to add and remove certain components.</li>
 <li>Properties - the Properties view enables you to edit the properties of
@@ -53,3 +53,4 @@
 </ul></section>
 </conbody>
 </concept>
+<?Pub *0000002883?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
index 7aeb983..284014b 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
-<reference id="ricons" xml:lang="en-us">
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
+<reference id="ricons" xml:lang="en-us"><?Pub Caret1?>
 <title>Icons used in the XML schema editor</title>
 <titlealts>
 <searchtitle>XML schema editor icons</searchtitle>
 </titlealts>
-<shortdesc>The following XML schema editor icons appear in the Outline, Graph,
+<shortdesc>The following XML schema editor icons appear in the Outline, Design,
 and Properties view.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>icons</indexterm></indexterm>
@@ -136,3 +137,4 @@
 </table>
 </refbody>
 </reference>
+<?Pub *0000004581?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
index b6b61d1..17c19b2 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="taddagrp" xml:lang="en-us">
 <title>Adding attribute groups</title>
 <titlealts>
@@ -27,18 +28,18 @@
 <step><cmd>In the Outline view, right-click the <uicontrol>Attribute Groups</uicontrol> folder
 and click  <uicontrol>Add Attribute Group</uicontrol>.</cmd><info>It appears
 in the <uicontrol>Attribute Groups</uicontrol> folder.</info></step>
-<step><cmd>Select your new group, and in the Graph view, right-click the attribute
-group and select <menucascade><uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol>
+<step><cmd>Select your new group, and in the Design view, right-click the
+attribute group and select <menucascade><uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol>
 </menucascade>. In the <uicontrol>New Name</uicontrol> field, type a name
 for the attribute group.</cmd></step>
 <step><cmd>To add an attribute, right-click your attribute group in the Outline
 view, click <uicontrol>Add Attribute</uicontrol>.</cmd><info>The attribute
 appears below the attribute group in the Outline view.</info>
 <substeps>
-<substep><cmd>Select the attribute, and in the Graph view, click the current
+<substep><cmd>Select the attribute, and in the Design view, click the current
 (default) name of the attribute, then type the new <uicontrol>Name</uicontrol>.</cmd>
 </substep>
-<substep><cmd>In the Graph view, click the current (default) attribute type
+<substep><cmd>In the Design view, click the current (default) attribute type
 and select a type from the menu. Alternately, you can select browse to invoke
 the Set Type menu for more options.</cmd><info>The Set Type dialog lists all
 built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
@@ -55,29 +56,21 @@
 </substeps>
 </step>
 <step><cmd>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, in the Graph view, right-click the complex
+To add an attribute reference, in the Design view, right-click the complex
 type containing the element, and click <uicontrol>Add Attribute Ref</uicontrol>.</cmd>
 <info>A declaration that references a global attribute enables the referenced
 attribute to appear in the instance document in the context of the referencing
-declaration.</info>
-<substeps>
-<substep><cmd>Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</cmd>
-</substep>
-</substeps>
+declaration. Select the reference, then select the attribute group you want
+it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</info>
 </step>
 <step><cmd>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, in the Graph view, right-click
+group. To add an attribute group reference, in the Design view, right-click
 the complex type containing the element, and click <uicontrol>Add Attribute
 Group Ref</uicontrol>.</cmd><info>A declaration that references a global attribute
 enables the referenced attribute to appear in the instance document in the
-context of the referencing declaration.</info>
-<substeps>
-<substep><cmd>Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</cmd>
-</substep>
-</substeps>
-</step>
+context of the referencing declaration. Select the reference, then select
+the attribute group you want it to reference in the Properties view, from
+the<uicontrol>Ref</uicontrol> menu.</info></step>
 <step><cmd>An <codeph>any</codeph> element enables element content according
 to namespaces, and the corresponding <codeph>any</codeph> attribute element
 enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,
@@ -85,18 +78,26 @@
 <info>The <codeph>any</codeph> appears below the attribute group in the Outline
 view. You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace), <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </choice>
-<choice>For a <uicontrol>processContents</uicontrol> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b> (the
-XML processor will validate the attribute content as much as it can), or <b>strict</b> (the
-XML processor will validate all the attribute content).</choice>
+<choice>For a <uicontrol>namespace</uicontrol><?Pub Caret?> value, you can
+select:<ul>
+<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
+<li><b>##local </b>. This allows any well-formed XML that is not declared
+to be in a namespace.</li>
+<li><b>##other</b>. This allows any well-formed XML that is not from the target
+namespace of the type being defined.</li>
+<li><b>##targetNamespace </b>. This is shorthand for the target namespace
+of the type being defined.</li>
+</ul></choice>
+<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>
+<li><b>skip</b>. The XML processor will not validate the attribute content
+at all.</li>
+<li><b>lax</b>. The XML processor will validate the attribute content as much
+as it can.</li>
+<li><b>strict</b>. The XML processor will validate all the attribute content.</li>
+</ul></choice>
 </choices>
 </step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000005769?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
index 99023c3..702582d 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddanye" xml:lang="en-us">
 <title>Adding an any element</title>
 <titlealts>
 <searchtitle>Adding an any element</searchtitle>
 </titlealts>
-<shortdesc>You can use the <codeph>any</codeph> element to provide something
-similar to a DTD's ANY content model, however, it must be done in conjunction
-with namespaces. This enables you to include any well-formed XML content,
-such as an HTML Web page that conforms to XHTML 1.0 syntax.</shortdesc>
+<shortdesc>You can use the <codeph>any</codeph> element in a similar way as
+a DTD's ANY content model, however, it must be done in conjunction with namespaces.
+This enables you to include any well-formed XML content, such as an HTML Web
+page that conforms to XHTML 1.0 syntax.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>adding<indexterm>an any element</indexterm></indexterm></indexterm>
 <indexterm>XML schema editor<indexterm>an any element<indexterm>adding</indexterm></indexterm></indexterm>
@@ -23,25 +25,34 @@
 &lt;any namespace ="http://www.w3.org/1999/xhtml>
  &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/>
 &lt;/complexType>
-&lt;/element></codeblock></p><p>The preceding schema fragment allows a <varname>&lt;MyWebPage></varname> element
+&lt;/element></codeblock></p><p>The preceding schema fragment allows a <codeph>&lt;MyWebPage></codeph> element
 to contain any well-formed XHTML data that appears in the specified namespace.</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 <codeph>any</codeph> element,
-follow these steps:</p></context>
+will also work in many other perspectives.</p><p>To add an <codeph>any</codeph> element:</p></context>
 <steps>
 <step><cmd>In the Outline view, right-click the content model that you want
 to work with and click <uicontrol>Add Any</uicontrol>. </cmd></step>
 <step><cmd>Select the new <codeph>any</codeph> element.</cmd></step>
-<step><cmd>In the Properties view of the schema editor, for a <b>namespace</b> value,
-you can select <b>##any</b> (this allows any well-formed XML from any namespace), <b>##local </b> (this
-allows any well-formed XML that is not declared to be in a namespace), <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </cmd></step>
-<step><cmd>For a <uicontrol>processContents</uicontrol> value, you can select <b>skip</b> (the
-XML processor will not validate the content at all), <b>lax</b> (the XML processor
-will validate the content as much as it can), or <b>strict </b> (the XML processor
-will validate all the content).</cmd></step>
+<step><cmd>In the Properties view of the schema editor, for a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value,
+you can select:</cmd>
+<choices>
+<choice><b>##any</b>. This allows any well-formed XML from any namespace.</choice>
+<choice><b>##local </b>. This allows any well-formed XML that is not declared
+to be in a namespace.</choice>
+<choice><b>##other </b>. This allows any well-formed XML that is not from
+the target namespace of the type being defined.</choice>
+<choice><b>##targetNamespace</b>. This is shorthand for the target namespace
+of the type being defined.</choice>
+</choices>
+</step>
+<step><cmd>For a <uicontrol>processContents</uicontrol> value, you can select:</cmd>
+<choices>
+<choice><b>skip</b>. The XML processor will not validate the content at all.</choice>
+<choice><b>lax</b>. The XML processor will validate the content as much as
+it can.</choice>
+<choice><b>strict</b>. The XML processor will validate all the content.</choice>
+</choices>
+</step>
 <step><cmd>The <uicontrol>minOccurs</uicontrol> value is the number of times
 the <codeph>any</codeph> element must appear in an instance document. You
 can select <uicontrol>0</uicontrol> if you want the element to be optional;
@@ -53,12 +64,15 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <postreq><p>(c) Copyright 2001, World Wide Web (Massachusetts Institute of
 Technology, Institut National de Recherche en Informatique et en Automatique,
 Keio University).</p></postreq>
 </taskbody>
 </task>
+<?Pub *0000004291?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
index 8dfae32..e283139 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddcmod" xml:lang="en-us">
 <title>Adding content models</title>
 <titlealts>
@@ -35,13 +37,13 @@
 model to an element, global element, complex type, or group, follow these
 steps:</p></context>
 <steps>
-<step><cmd>In the Graph view, select your complex type, or group:</cmd>
+<step><cmd>In the Design view, select your complex type, or group:</cmd>
 <choices>
 <choice>If you selected a complex type, you can right-click it and click <uicontrol>Add
 Sequence</uicontrol>, or <uicontrol>Add Choice</uicontrol> to add the type
 of content model you want to your complex type. If you wish to use the <uicontrol>all</uicontrol> content
-model, you can change the model by clicking the model in the Graph view, and
-in properties, select <uicontrol>all</uicontrol> as the <uicontrol>Kind</uicontrol>.
+model, you can change the model by clicking the model in the Design view,
+and in properties, select <uicontrol>all</uicontrol> as the <uicontrol>Kind</uicontrol>.
 Your content model is automatically added as a child of your complex type
 - expand in the Outline view to see it. <b>Note:</b> These options will not
 appear if you have set a base type for your complex type. You can either set
@@ -54,18 +56,21 @@
 </choices>
 </step>
 <step><cmd>(Optional) Select the appropriate value in the <uicontrol>MinOccurs</uicontrol> field.</cmd>
-<info>This is the number of times the content model must appear. If you want
-the content model to be optional, select <uicontrol>0</uicontrol>. Otherwise,
-select <uicontrol>1</uicontrol>. </info></step>
+<info>This is the minimum number of times the content model must appear. If
+you want the content model to be optional, select <uicontrol>0</uicontrol>.
+Otherwise, select <uicontrol>1</uicontrol>. </info></step>
 <step><cmd>(Optional) Select the appropriate value in the <uicontrol>MaxOccurs</uicontrol> field.</cmd>
 <info>This is the maximum number of times a content model can appear. You
 can select <uicontrol>unbounded</uicontrol> to indicate there is no maximum
 number of occurrences.</info></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this content model.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
+is used for human readable material, such as a description.<?Pub Caret?></info>
 </step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <postreq><p>You can add the following items to a content object model. </p><ul>
 <li>Another content model.</li>
@@ -82,3 +87,4 @@
 </ul></postreq>
 </taskbody>
 </task>
+<?Pub *0000005317?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
index 5d8d50e..3d1f73f 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddcmxt" xml:lang="en-us">
 <title>Adding complex types</title>
 <titlealts>
@@ -24,83 +26,83 @@
 an XML schema, follow these steps:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
-<step><cmd>Right-click the Types category in the Graph view, and click <uicontrol>Add
+<step><cmd>Right-click the Types category in the Design view, and click <uicontrol>Add
 Complex Type</uicontrol>.</cmd></step>
 <step><cmd>In the Properties view, type a new name for the complex type in
 the <uicontrol>Name</uicontrol> field.</cmd></step>
-<step><cmd>Click the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
-<alt>Browse icon</alt></image> button to select a base type for your complex
-type.</cmd><info>You can either set a base type for your complex type, or
-you can add a content model to it (which represents any data that can be contained
-inside an element), but you cannot do both. For more information about content
-models, refer to the related tasks.</info></step>
+<step><cmd>Click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
+<alt>Browse icon</alt></image> to select a base type for your complex type.</cmd>
+<info>You can either set a base type for your complex type, or you can add
+a content model to it (which represents any data that can be contained inside
+an element), but you cannot do both. For more information about content models,
+refer to the related tasks.</info></step>
 <step><cmd>Select <uicontrol>restriction</uicontrol> or <uicontrol>extension</uicontrol> from
 the <uicontrol>Inherited by</uicontrol> list.</cmd><info>This specifies whether
 your type is derived from its base type by restriction or extension.</info>
 </step>
-<step><cmd>The Graph view will display the attributes within the complex type.</cmd>
-<info>You can also use this view to add attributes to your complex type. An
-attribute associates an attribute name with a specific type and value.</info>
-<substeps>
-<substep><cmd>To add an attribute, in the graph view, right click your complex
-type and select <uicontrol>Add Attribute</uicontrol>.</cmd></substep>
-</substeps>
+<step><cmd>The Design view will display the attributes within the complex
+type.</cmd><info>You can also use this view to add attributes to your complex
+type. An attribute associates an attribute name with a specific type and value.</info>
 <choices>
-<choice><uicontrol>name</uicontrol>. In the Graph view, click the name of
-the attribute to make a change.</choice>
-<choice><uicontrol>type</uicontrol>. In the Graph view, click the type of
-the attribute to make a change. The drop-down menu provides commonly used
-types. For more options, simply select <uicontrol>Browse</uicontrol> from
-the menu.</choice>
+<choice>To add an attribute, in the Design view, right click your complex
+type and select <uicontrol>Add Attribute</uicontrol>.<ul>
+<li><uicontrol>name</uicontrol>. In the Design view, click the name of the
+attribute to make a change.</li>
+<li><uicontrol>type</uicontrol>. In the Design view, click the type of the
+attribute to make a change. The drop-down menu provides commonly used types.
+For more options, simply select <uicontrol>Browse</uicontrol> from the menu.</li>
+</ul></choice>
 </choices>
 </step>
 <step><cmd>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, in the Graph view, right-click the complex
+To add an attribute reference, in the Design view, right-click the complex
 type containing the element, and click <uicontrol>Add Attribute Ref</uicontrol>.</cmd>
 <info>A declaration that references a global attribute enables the referenced
 attribute to appear in the instance document in the context of the referencing
-declaration. </info>
-<substeps>
-<substep><cmd>Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</cmd>
-</substep>
-</substeps>
+declaration. Select the reference, then select the attribute group you want
+it to reference in the Properties view, from the<uicontrol> Ref</uicontrol> menu.</info>
 </step>
 <step><cmd>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, in the Graph view, right-click
+group. To add an attribute group reference, in the Design view, right-click
 the complex type containing the element, and click <uicontrol>Add Attribute
 Group Ref</uicontrol>.</cmd><info>A declaration that references an attribute
 group enables the referenced attribute group to appear in the instance document
-in the context of the referencing declaration.</info>
-<substeps>
-<substep><cmd>Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</cmd>
-</substep>
-</substeps>
-</step>
+in the context of the referencing declaration. Select the reference, then
+select the attribute group you want it to reference in the Properties view,
+from the<uicontrol> Ref</uicontrol> menu.</info></step>
 <step><cmd>An <codeph>any</codeph> element enables element content according
 to namespaces, and the corresponding <codeph>any</codeph> attribute element
 enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,
 right-click in the complex type header, and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>
 <info>You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace, <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </choice>
-<choice>For a <uicontrol>processContents</uicontrol> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b>(the
-XML processor will validate the attribute content as much as it can), or <b>strict </b> (the
-XML processor will validate all the attribute content).</choice>
+<choice>For a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value, you can
+select:<ul>
+<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
+<li><b>##local </b>. This allows any well-formed XML that is not declared
+to be in a namespace.</li>
+<li><b>##other</b>. This allows any well-formed XML that is not from the target
+namespace of the type being defined.</li>
+<li><b>##targetNamespace </b>. This is shorthand for the target namespace
+of the type being defined.</li>
+</ul></choice>
+<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>
+<li><b>skip</b>. The XML processor will not validate the attribute content
+at all.</li>
+<li><b>lax</b>. The XML processor will validate the attribute content as much
+as it can.</li>
+<li><b>strict</b>. The XML processor will validate all the attribute content.</li>
+</ul></choice>
 </choices>
 <info></info></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this complex type.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000006207?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
index 13d728e..1a00999 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddelm" xml:lang="en-us">
 <title>Adding elements</title>
 <titlealts>
 <searchtitle>Adding elements</searchtitle>
 </titlealts>
 <shortdesc>Elements are fundamental building blocks in XML. Element declarations
-provide value constraints, and a description that can be used for validation,
-as well as establishing constraining relationships between related elements
-and attributes, and controlling substitution of elements.</shortdesc>
+provide value constraints, provide a description that can be used for validation,
+establish constraining relationships between related elements and attributes,
+and control the substitution of elements.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>adding<indexterm>elements</indexterm></indexterm></indexterm>
 <indexterm>XML schema editor<indexterm>elements<indexterm>adding</indexterm></indexterm></indexterm>
@@ -19,17 +21,16 @@
 </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 add an element,
-follow these steps:</p></context>
+but they will also work in many other perspectives.</p><p>To add an element:</p></context>
 <steps>
-<step><cmd>To add an element, in the Graph view, right-click the content model
-you want to work with and click <uicontrol>Add Element</uicontrol>.</cmd>
-<info>The element appears attached to the content model in the Graph view.</info>
+<step><cmd>To add an element, in the Design view, right-click the content
+model you want to work with and click <uicontrol>Add Element</uicontrol>.</cmd>
+<info>The element appears attached to the content model in the Design view.</info>
 <substeps>
-<substep><cmd>Select the element, and in the Graph view, click the current
+<substep><cmd>In the Design view, select the element, and click the current
 (default) name of the element, which puts you in direct editing mode, then
-type the new <uicontrol>Name</uicontrol> and hit enter.</cmd></substep>
-<substep><cmd>In the Graph view, click the current (default) element type
+type the new <uicontrol>Name</uicontrol> and press enter.</cmd></substep>
+<substep><cmd>In the Design view, click the current (default) element type
 and select a type from the menu. Alternately, you can select browse to invoke
 the Set Type dialog for more options.</cmd><info>The Set Type dialog lists
 all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
@@ -46,22 +47,25 @@
 </substeps>
 </step>
 <step><cmd>(Optional) In the Properties view, select the appropriate value
-in the <uicontrol>MinOccurs</uicontrol> field.</cmd><info>This is the minimum
-number of times the element can appear in an instance document. If you want
-the element to be optional, select <uicontrol>0</uicontrol>. Otherwise, select <uicontrol>1</uicontrol>. </info>
+in the <uicontrol>MinOccurs</uicontrol> field.</cmd><info>This is the <?Pub Caret?>number
+of times the element can appear in an instance document. If you want the element
+to be optional, select <uicontrol>0</uicontrol>. Otherwise, select <uicontrol>1</uicontrol>. </info>
 </step>
 <step><cmd>(Optional) Select the appropriate value in the <uicontrol>MaxOccurs</uicontrol> field.</cmd>
 <info>This is the maximum number of times the element can appear in an instance
-document. You can select <uicontrol>unbounded</uicontrol> to indicate there
-is no maximum number of occurrences.</info></step>
+document. Select <uicontrol>unbounded</uicontrol> to indicate there is no
+maximum number of occurrences.</info></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <postreq>You can add a content model to an element, which is the representation
 of any data that can be contained inside the element. For more information
 about working with content models, refer to the related tasks.</postreq>
 </taskbody>
 </task>
+<?Pub *0000004079?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
index b37409d..f2d6675 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddelmr" xml:lang="en-us">
 <title>Adding element references</title>
 <titlealts>
@@ -21,20 +23,20 @@
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p><p>To add an element
-reference, follow these steps:</p></context>
+reference:</p></context>
 <steps>
-<step><cmd>In the Graph view, right-click the content model you want to work
+<step><cmd>In the Design view, right-click the content model you want to work
 with and click <uicontrol>Add Element Ref</uicontrol>.</cmd><stepresult>If
 no global element is defined in the document, a new global element is created
 for you, and the element reference will point to it.</stepresult></step>
-<step><cmd>Select the element reference. You can specify the following values
-for an element reference:</cmd>
+<step><cmd>Select the element reference. To specify values for an element
+reference:</cmd>
 <choices>
-<choice><uicontrol>name</uicontrol>. Click the name of the element reference
-in the Graph view. Enter the name of the element reference.</choice>
-<choice><uicontrol>type</uicontrol>. Click the element reference type in the
-Graph view. Select a type from the menu, or select <uicontrol>Browse</uicontrol> for
-more options.</choice>
+<choice>Click the name of the element reference in the Design view. Enter
+the name of the element reference.</choice>
+<choice>Click the element reference type in the Design<?Pub Caret?> view.
+Select a type from the menu, or select <uicontrol>Browse</uicontrol> for more
+options.</choice>
 </choices>
 </step>
 <step><cmd>(Optional) Select the appropriate value in the <uicontrol>MinOccurs</uicontrol> field.</cmd>
@@ -47,9 +49,12 @@
 is no maximum number of occurrences.</info></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this element reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000003232?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
index 4e13289..f975e1c 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddglba" xml:lang="en-us">
 <title>Adding global attributes</title>
 <titlealts>
@@ -19,18 +21,18 @@
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p><p>To add a global
-attribute, follow these steps:</p></context>
+attribute:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
-<step><cmd>In the Graph view, right click in the <b>Attributes</b> section
+<step><cmd>In the Design view, right-click in the <b>Attributes</b> section
 and click <uicontrol>Add Attribute</uicontrol>.</cmd></step>
-<step><cmd>In the Properties view, type the attribute <uicontrol>Name</uicontrol>.</cmd>
+<step><cmd>In the Properties view, enter a name for the attribute in the <uicontrol>Name</uicontrol> field.</cmd>
 </step>
 <step><cmd>In the Properties view, you can select the attribute <uicontrol>Type</uicontrol> from
 the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>
-<info><p>Alternately, you can select <uicontrol>Browse</uicontrol> from the
-list for more options. </p><p>The Set Type dialog will appear, and lists all
-built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
+<info><p>Alternatively<?Pub Caret?>, you can select <uicontrol>Browse</uicontrol> from
+the list for more options. </p><p>The Set Type dialog will appear, and lists
+all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
 the list by selecting one of the following options:<ul>
 <li><uicontrol>Workspace</uicontrol>. Lists all of the types available in
 your workspace. </li>
@@ -44,9 +46,12 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this global attribute.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000003230?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
index 84dda0c..6e0139d 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddglem" xml:lang="en-us">
 <title>Adding global elements</title>
 <titlealts>
@@ -19,22 +21,23 @@
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p><p>To add a global
-element, follow these steps:</p></context>
+element:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, select your schema.</cmd><info>The entire
-schema and its contents should be displayed in the Graph view.</info></step>
-<step><cmd>In the Graph view, right click in the <b>Elements</b> section and
-click <uicontrol>Add Element</uicontrol>.</cmd></step>
+schema and its contents are displayed in the Design view.</info></step>
+<step><cmd>In the Design view, right-click in the <b>Elements</b> section
+and click <uicontrol>Add Element</uicontrol>.</cmd></step>
 <step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab,
 and type a new name for the global element in the <uicontrol>Name</uicontrol> field.</cmd>
 </step>
-<step><cmd>In the Properties view, you can select the attribute <uicontrol>Type</uicontrol> from
+<step><cmd>In the Properties view, you can select the attribute type from
 the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>
-<info><p>Alternately, you can select <uicontrol>Browse</uicontrol> from the
-list for more options. </p><p>The Set Type dialog will appear, and lists all
-built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of
-the list by selecting one of the following options:<ul>
+<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from
+the list for more options. </p><p>The <uicontrol>Set Type</uicontrol> dialog
+box appears, and lists all built-in and user-defined types currently available.
+You can change the <uicontrol>Scope</uicontrol> of the list by selecting one
+of the following options:<ul>
 <li><uicontrol>Workspace</uicontrol>. Lists all of the types available in
 your workspace. </li>
 <li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available
@@ -56,47 +59,46 @@
 element may be replaced by an element derived from it.</choice>
 <choice><uicontrol>final</uicontrol>. This field determines whether this global
 element may be derived from.</choice>
-<choice><uicontrol>fixed/default</uicontrol>. Click the <uicontrol>Browse</uicontrol> button
-and select the <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the global
-element has a fixed value, which cannot be changed. If you select <b>Default</b>,
+<choice><uicontrol>fixed/default</uicontrol>. Click <uicontrol>Browse</uicontrol> and
+select <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> and
+specify an appropriate value. If you select <b>Fixed</b>, the global element
+has a fixed value, which cannot be changed. If you select <b>Default</b>,
 the element has a default value.</choice>
 <choice><uicontrol>form</uicontrol>. Use this field to indicate if the appearance
-of this global element in an instance of the XML schema (that is, an XML file
-associated with the XML schema) must be qualified by a namespace.</choice>
+of this global element in an instance of the XML schema (an XML file associated
+with the XML schema) must be qualified by a namespace.</choice>
 <choice><uicontrol>nillable</uicontrol>. Select <b>true</b> if you do not
 want the global element to be able to have any child elements, only attributes. </choice>
 <choice><uicontrol>substitutionGroup</uicontrol>. A substitution group allows
 elements to be substituted for other elements.</choice>
 </choices>
 </step>
-<step><cmd>Click the <uicontrol>Attributes</uicontrol> tab</cmd><info>You
+<step><cmd>Click the <uicontrol>Attributes</uicontrol> tab.</cmd><info>You
 can use this page to add attributes, attribute references, attributes group
 references, and <codeph>any</codeph> attributes to your global element.</info>
 </step>
 <step><cmd>An attribute associates an attribute name with a specific type
 and value. To add an attribute, right-click in the Attributes page, and click <uicontrol>Add
 Attribute</uicontrol>.</cmd><info>You can specify the following values for
-an attribute</info>
+an attribute:</info>
 <choices>
-<choice><uicontrol>fixed/default</uicontrol>. Click the <uicontrol>Browse</uicontrol> button
-and select the <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> radio
-button and specify an appropriate value. If you select <b>Fixed</b>, the attribute
-has a fixed value, which cannot be changed. If you select <b>Default</b>,
-the attribute has a default value.</choice>
+<choice><uicontrol>fixed/default</uicontrol>. Click <uicontrol>Browse</uicontrol> and
+select <uicontrol>Fixed</uicontrol> or <uicontrol>Default</uicontrol> and
+specify an appropriate value. If you select <b>Fixed</b>, the attribute has
+a fixed value, which cannot be changed. If you select <b>Default</b>, the
+attribute has a default value.</choice>
 <choice><uicontrol>form</uicontrol>. Use this field to indicate if the appearance
 of this attribute in an instance of the XML schema must be qualified by a
 namespace.</choice>
 <choice><uicontrol>name</uicontrol>. Enter the name of the attribute.</choice>
-<choice><uicontrol>type</uicontrol>. Click the <uicontrol>Browse</uicontrol> button
-and select the type of the attribute. </choice>
+<choice><uicontrol>type</uicontrol>. Click <uicontrol>Browse</uicontrol> and
+select the type of the attribute. </choice>
 <choice><uicontrol>use</uicontrol>. This field indicates how an attribute
-can be used in an instance document. If you select <b>optional</b>, the attribute
-can appear once, but it does not have to. If you select <b>required</b>, the
-attribute must appear once. If you select <b>prohibited</b>, the attribute
-must not appear. <b>Note</b>: If you selected the <uicontrol>Default</uicontrol> radio
-button, you must select <b>optional</b> in this field, otherwise the default
-value will not be valid.</choice>
+can be used in an instance document. If you select optional, the attribute
+can appear once, but it does not have to. If you select required, the attribute
+must appear once. If you select prohibited, the attribute must not appear. <b>Note</b>:
+If you selected <uicontrol>Default</uicontrol>, you must select <b>optional</b> in
+this field, otherwise the default value will not be valid.</choice>
 </choices>
 </step>
 <step><cmd>An attribute reference provides a reference to a global attribute.
@@ -105,23 +107,16 @@
 attribute enables the referenced attribute to appear in the instance document
 in the context of the referencing declaration. The menu option to add an attribute
 reference only appears if there are global attributes defined elsewhere in
-the document.</info>
-<substeps>
-<substep><cmd>Select the reference, then select the global attribute you want
-it to reference from the <uicontrol>ref</uicontrol> list.</cmd></substep>
-</substeps>
-</step>
+the document. Select the reference, then select the global attribute you want
+it to reference from the <uicontrol>ref</uicontrol> list.</info></step>
 <step><cmd>An attribute group reference provides a reference to an attribute
 group. To add an attribute group reference, right-click in the Attributes
 page, and click <uicontrol>Add Attribute Group Ref</uicontrol>.</cmd><info>A
 declaration that references an attribute group enables the referenced attribute
 group to appear in the instance document in the context of the referencing
 declaration. The menu option to add an attribute group reference only appears
-if there are attribute groups defined elsewhere in the document.</info>
-<substeps>
-<substep><cmd>Select the reference, then select the attribute group you want
-it to reference from the <uicontrol>ref</uicontrol> list.</cmd></substep>
-</substeps>
+if there are attribute groups defined elsewhere in the document. Select the
+reference, then select the attribute group you want it to reference from the <uicontrol>ref</uicontrol> list.</info>
 </step>
 <step><cmd>An <codeph>any</codeph> element enables element content according
 to namespaces, and the corresponding <codeph>any</codeph> attribute element
@@ -129,26 +124,36 @@
 right-click in the Attributes page and click <uicontrol>Add Any Attribute</uicontrol>.</cmd>
 <info>You can specify the following values for an <codeph>any</codeph> attribute:</info>
 <choices>
-<choice>For a <b>namespace</b> value, you can select <b>##any</b> (this allows
-any well-formed XML from any namespace), <b>##local </b> (this allows any
-well-formed XML that is not declared to be in a namespace), <b>##other </b> (this
-allows any well-formed XML that is not from the target namespace of the type
-being defined) or <b>##targetNamespace </b> (which is shorthand for the target
-namespace of the type being defined). </choice>
-<choice>For a <uicontrol>processContents</uicontrol> value, you can select <b>skip</b> (the
-XML processor will not validate the attribute content at all), <b>lax</b> (the
-XML processor will validate the attribute content as much as it can), or <b>strict</b> (the
-XML processor will validate all the attribute content).</choice>
+<choice>For a <uicontrol>namespace</uicontrol> <?Pub Caret1?>value, you can
+select:<ul>
+<li><b>##any</b>. This allows any well-formed XML from any namespace.</li>
+<li><b>##local </b>. This allows any well-formed XML that is not declared
+to be in a namespace.</li>
+<li><b>##other</b>. This allows any well-formed XML that is not from the target
+namespace of the type being defined.</li>
+<li><b>##targetNamespace </b>. This is shorthand for the target namespace
+of the type being defined.</li>
+</ul></choice>
+<choice>For a <uicontrol>processContents</uicontrol> value, you can select:<ul>
+<li><b>skip</b>. The XML processor will not validate the attribute content
+at all.</li>
+<li><b>lax</b>. The XML processor will validate the attribute content as much
+as it can.</li>
+<li><b>strict</b>. The XML processor will validate all the attribute content.</li>
+</ul></choice>
 </choices>
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this global element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <postreq>You can add a content model to a global element, which is the representation
 of any data that can be contained inside the global element. For more information
 about working with content models, refer to the related tasks.</postreq>
 </taskbody>
 </task>
+<?Pub *0000009579?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
index d20cb4d..841870d 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddgrpr" xml:lang="en-us">
 <title>Adding group references</title>
 <titlealts>
@@ -22,16 +24,20 @@
 written for the Resource perspective, but they will also work in many other
 perspectives.</p><p>To add a group reference, follow these steps:</p></context>
 <steps>
-<step><cmd>In the Graph view, right-click the content model you want to work
+<step><cmd>In the Design view, right-click the content model you want to work
 with and select <uicontrol>Add Group Ref</uicontrol>.</cmd></step>
 <step><cmd>Select the new group reference.</cmd></step>
 <step><cmd>In the Properties view, select the group you want to refer to in
 the <uicontrol>ref</uicontrol> list.</cmd></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this group reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
+is used for human readable material, such as a description.<?Pub Caret?></info>
 </step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000002277?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
index 4190277..215cf4a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="taddgrup" xml:lang="en-us">
 <title>Adding groups</title>
 <titlealts>
@@ -28,9 +29,11 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this group element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol><?Pub Caret?> page allows you to
+specify the schema and add XML content to your annotations.</info></step>
 <step><cmd>In the Outline view, expand the <uicontrol>Groups</uicontrol> folder
 and your new group.</cmd></step>
 <step><cmd>Your group automatically contains a content model. </cmd><info>A
@@ -40,3 +43,4 @@
 </steps>
 </taskbody>
 </task>
+<?Pub *0000002502?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
index 224702a..c8f253e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddimpt" xml:lang="en-us">
 <title>Adding import elements</title>
 <titlealts>
@@ -28,23 +30,24 @@
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, select your schema.</cmd><info>The entire
-schema and its contents should be displayed in the Graph view.</info></step>
-<step><cmd>In the Graph view, right click in the <b>Directives</b> section
+schema and its contents should be displayed in the Design view.</info></step>
+<step><cmd>In the Design view, right click in the <b>Directives</b> section
 and click <uicontrol>Add Import</uicontrol>.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> tab and click
-the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
-graphic is the Browse button</alt></image> button to the right of the <uicontrol>Schema
-location</uicontrol> field.</cmd></step>
-<step><cmd>If you want to import an XML schema located in the workbench, select
-the <uicontrol>Workbench projects</uicontrol> radio button and click <uicontrol>Next</uicontrol>. </cmd>
+<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image
+href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to
+the right of the <uicontrol>Schema location</uicontrol> field.</cmd></step>
+<step><cmd>If you want to import an XML schema located in the workbench:</cmd>
 <substeps>
+<substep><cmd>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </cmd>
+</substep>
 <substep><cmd>Select the schema you want to import and click <uicontrol>Finish</uicontrol>.</cmd>
 </substep>
 </substeps>
 </step>
-<step><cmd>If you want to import an XML schema located on the Web, select
-the <uicontrol>HTTP</uicontrol> radio button and click <uicontrol>Next</uicontrol>.</cmd>
+<step><cmd>If you want to import an XML schema located on the Web:<?Pub Caret?></cmd>
 <substeps>
+<substep><cmd>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</cmd>
+</substep>
 <substep><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>
 <info><note>A local copy of the schema will not be stored in the workbench.
 Every time you validate your schema, the schema's contents will be checked
@@ -58,9 +61,11 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this import element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <result><p>Once you have added an import element to your XML schema, when
 you define new elements, attributes, complex types, or simple types where
@@ -70,3 +75,4 @@
 <postreq></postreq>
 </taskbody>
 </task>
+<?Pub *0000004340?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
index f47d9b1..d52b832 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddincl" xml:lang="en-us">
 <title>Adding include elements</title>
 <titlealts>
@@ -9,9 +11,9 @@
 <shortdesc>As schemas become larger, it is often desirable to divide their
 content among several schema documents for purposes such as ease of maintenance,
 reuse, and readability. You can use the <codeph>include</codeph> element to
-brings in definitions and declarations from the included schema into the current
-schema. The included schema must be in the same target namespace as the including
-schema. </shortdesc>
+bring<?Pub Caret?> in definitions and declarations from the included schema
+into the current schema. The included schema must be in the same target namespace
+as the including schema. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>adding<indexterm>include
 elements</indexterm></indexterm></indexterm><indexterm>XML schema editor<indexterm>include
@@ -27,27 +29,21 @@
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, select your schema.</cmd><info>The entire
-schema and its contents should be displayed in the Graph view.</info></step>
-<step><cmd>In the Graph view, right click in the <b>Directives</b> section
+schema and its contents are displayed in the Design view.</info></step>
+<step><cmd>In the Design view, right-click in the <b>Directives</b> section
 and click <uicontrol>Add Include</uicontrol>.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> tab and click
-the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
-graphic is the Browse button</alt></image> button to the right of the <uicontrol>Schema
-location</uicontrol> field.</cmd><info>The XML schema file you select must
-have the same namespace as the current schema.</info></step>
-<step><cmd>If you want to select an XML schema located in the workbench, select
-the <uicontrol>Workbench projects</uicontrol> radio button and click <uicontrol>Next</uicontrol>. </cmd>
-<substeps>
-<substep><cmd>Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>
-</substep>
-</substeps>
+<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image
+href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to
+the right of the <uicontrol>Schema location</uicontrol> field.</cmd><info>The
+XML schema file you select must have the same namespace as the current schema.</info>
 </step>
-<step><cmd>If you want to select an XML schema located on the Web, select
-the <uicontrol>HTTP</uicontrol> radio button and click <uicontrol>Next</uicontrol>.</cmd>
-<substeps>
-<substep><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>. </cmd>
-</substep>
-</substeps>
+<step><cmd>If you want to select an XML schema located in the workbench, select <uicontrol>Workbench
+projects</uicontrol> and click <uicontrol>Next</uicontrol>. </cmd></step>
+<step><cmd>Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>
+</step>
+<step><cmd>If you want to select an XML schema located on the Web, select <uicontrol>HTTP</uicontrol> and
+click <uicontrol>Next</uicontrol>.</cmd></step>
+<step><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>
 <info><note> A local copy of the schema will not be stored in the workbench.
 Every time you validate your schema, the schema's contents will be checked
 from the URL you specify.</note></info></step>
@@ -57,9 +53,11 @@
 file.</cmd></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this include element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <result><p>Once you have added the include element to your XML schema, when
 you define new elements, attributes, complex types, or simple types where
@@ -79,3 +77,4 @@
 en Informatique et en Automatique, Keio University).</p></result>
 </taskbody>
 </task>
+<?Pub *0000004728?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
index 9264aea..ee680ef 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddnot" xml:lang="en-us">
 <title>Adding notations</title>
 <titlealts>
@@ -38,9 +40,14 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this notation.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
+is used for human readable material, such as a description. <uicontrol>App
 Info</uicontrol> page can be used to provide information for applications.</info>
 </step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info><?Pub Caret?></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000002959?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
index 3115a46..00e7b41 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddrdfn" xml:lang="en-us">
 <title>Adding redefine elements</title>
 <titlealts>
@@ -23,31 +25,25 @@
 schema, although external components from schemas that have no namespace can
 also be redefined.</p><p>The following instructions were written for the Resource
 perspective, but they will also work in many other perspectives.</p><p>To
-add a redefine element , follow these steps:</p></context>
+add a redefine element:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, select your schema.</cmd><info>The entire
-schema and its contents should be displayed in the Graph view.</info></step>
-<step><cmd>In the Graph view, right-click in the <b>Directives</b> section
+schema and its contents are displayed in the Design view.</info></step>
+<step><cmd>In the Design view, right-click in the <b>Directives</b> section
 and click <uicontrol>Add Redefine</uicontrol>.</cmd></step>
-<step><cmd>In the Properties view, click the <b>General</b> tab and click
-the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
-graphic is the Browse button</alt></image> button to the right of the <uicontrol>Schema
-location</uicontrol> field.</cmd><info>The XML schema file you select must
-have the same namespace as the current schema.</info></step>
-<step><cmd>If you want to select an XML schema located in the workbench, select
-the <uicontrol>Workbench projects</uicontrol> radio button and click <uicontrol>Next.</uicontrol></cmd>
-<substeps>
-<substep><cmd> Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>
-</substep>
-</substeps>
+<step><cmd>In the Properties view, click the <b>General</b> tab and click <uicontrol>Browse</uicontrol> <image
+href="../images/Browse.gif"><alt>This graphic is the Browse button</alt></image> to
+<?Pub Caret?>the right of the <uicontrol>Schema location</uicontrol> field.</cmd>
+<info>The XML schema file you select must have the same namespace as the current
+schema.</info></step>
+<step><cmd>If you want to select an XML schema located in the workbench, select <uicontrol>Workbench
+projects</uicontrol> and click <uicontrol>Next.</uicontrol></cmd></step>
+<step><cmd>Select the schema you want to include and click <uicontrol>Finish</uicontrol>.</cmd>
 </step>
-<step><cmd>If you want to select an XML schema located on the Web, select
-the <uicontrol>HTTP</uicontrol> radio button and click <uicontrol>Next</uicontrol>.</cmd>
-<substeps>
-<substep><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.
- </cmd></substep>
-</substeps>
+<step><cmd>If you want to select an XML schema located on the Web, select <uicontrol>HTTP</uicontrol> and
+click <uicontrol>Next</uicontrol>.</cmd></step>
+<step><cmd>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.</cmd>
 <info> <note>A local copy of the schema will not be stored in the workbench.
 Every time you validate your schema, the schema's contents will be checked
 from the URL you specify.</note></info></step>
@@ -57,12 +53,15 @@
 file.</cmd></step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this redefine element.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 <result><p>Once you have added the redefine element to your XML schema, you
 can redefine any of the simple and complex types, groups, and attribute groups
 in the XML schema you selected in the redefine element. </p></result>
 </taskbody>
 </task>
+<?Pub *0000004055?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
index a177581..a0fc73b 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="taddreg" xml:lang="en-us">
 <title>Adding pattern facets to simple types</title>
 <titlealts>
@@ -20,32 +21,41 @@
 <taskbody>
 <context><p> The value of the pattern is called a regular expression. You
 can specify it using the <uicontrol>Regular Expression</uicontrol> wizard.</p><p>To
-add a pattern to a simple type, follow these steps:</p></context>
+add a pattern to a simple type:</p></context>
 <steps>
-<step><cmd>In the Graph view, select the simple type you want to work with.</cmd>
+<step><cmd>In the Design view, select the simple type you want to work with.</cmd>
 </step>
 <step><cmd>In the Properties view, click the <uicontrol>Constraints</uicontrol> tab,
-then the <uicontrol>Patterns</uicontrol> radio button.</cmd></step>
-<step><cmd>Click <uicontrol>Add...</uicontrol>.</cmd><info>The Regular Expression
-Wizard opens.</info></step>
+then <uicontrol>Patterns</uicontrol>.</cmd></step>
+<step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The Regular Expression
+wizard opens.</info></step>
 <step><cmd>Select the token you want to add to the expression.</cmd></step>
 <step><cmd>Indicate how often you want the token to appear in order for a
-match to succeed.</cmd><info>If you want the token to repeat, click <uicontrol>Repeat</uicontrol> and
-specify the number of times the token must appear. If you want to specify
-a minimum and maximum number of times the token can appear, click <uicontrol>Range</uicontrol> and
-enter a minimum and maximum value.</info></step>
-<step><cmd>Click <uicontrol>Add</uicontrol> to add the token to the regular
-expression.</cmd></step>
-<step><cmd>Repeat the previous three steps as necessary to create the entire
-expression.</cmd></step>
+match to succeed:</cmd>
+<choices>
+<choice>If you want the token to repeat, click <uicontrol>Repeat</uicontrol> and
+specify the number of times the token must appear.</choice>
+</choices>
+<choices>
+<choice> If you want to specify a minimum and maximum number of times the
+token can appear, click <uicontrol>Range</uicontrol> and enter a minimum and
+maximum value.</choice>
+</choices>
+</step>
+<step><cmd>To add the token to the regular expression, click <uicontrol>Add</uicontrol>. </cmd>
+</step>
+<step><cmd>To create the entire expression, repeat steps 4 - 6 as necessary.</cmd>
+</step>
 <step><cmd>When you are finished, click <uicontrol>Next</uicontrol>.</cmd>
 </step>
-<step><cmd>(Optional) Enter some sample text to test against the regular expression
-and see if a match occurs. </cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
+<step><cmd>(Optional) To test against the regular expression and see if a
+match occurs, enter sample text.</cmd></step>
+<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult> The regular
+expression will appear in the Patterns page. <note type="tip"> To edit an
+existing pattern, select it in the Patterns page and click <uicontrol>Edit</uicontrol>.
+To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. <?Pub Caret?></note></stepresult>
+</step>
 </steps>
-<result>The regular expression will appear in the Patterns page.</result>
-<postreq>To edit an existing pattern, select it in the Patterns page and click <uicontrol>Edit</uicontrol>.
-To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. </postreq>
 </taskbody>
 </task>
+<?Pub *0000002952?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
index c656ab9..5321111 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
@@ -1,14 +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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="taddsmpt" xml:lang="en-us">
 <title>Adding simple types</title>
 <titlealts>
 <searchtitle>Adding simple types</searchtitle>
 </titlealts>
-<shortdesc>Simple types are used to created derived datatypes. They provide
-a set of constraints on the value space (that is, a set of values) and the
-lexical space (that is, a set of valid literals) of a datatype.</shortdesc>
+<shortdesc>Simple types are used to create<?Pub Caret?> derived datatypes.
+They provide a set of constraints on the value space (a set of values) and
+the lexical space (a set of valid literals) of a datatype.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>adding<indexterm>simple types</indexterm></indexterm></indexterm>
 <indexterm>XML schema editor<indexterm>simple types<indexterm>adding</indexterm></indexterm></indexterm>
@@ -19,17 +21,18 @@
 <taskbody>
 <context><p>A simple type cannot have element content and cannot carry attributes.
 Elements that contain numbers (and strings, and dates, and so on) but do not
-contain any sub-elements are said to have a simple type.</p><p>The following
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</p><p>To add a simple type, follow these
-steps:</p></context>
+contain any sub-elements have a simple type.</p><p>The following instructions
+were written for the Resource perspective, but they will also work in many
+other perspectives.</p><p>To add a simple type:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, right-click <b>Types</b>, and click <uicontrol>Add
 Simple Type</uicontrol>.</cmd></step>
-<step><cmd>In the Outline view, select the new simple type, and in the Properties
-view, click the <uicontrol>General</uicontrol> tab. Then type a new name for
-the simple type in the <uicontrol>Name</uicontrol> field.</cmd></step>
+<step><cmd>In the Outline view, select the new simple type.</cmd></step>
+<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>
+</step>
+<step><cmd>Type a new name for the simple type in the <uicontrol>Name</uicontrol> field.</cmd>
+</step>
 <step><cmd>You can select the following options from the <uicontrol>Variety</uicontrol> list:</cmd>
 <choices>
 <choice><uicontrol>atomic</uicontrol>. Atomic types are all the simple types
@@ -42,13 +45,13 @@
 atomic and list types.</choice>
 </choices>
 </step>
-<step><cmd>If you selected <uicontrol>atomic</uicontrol> from the <uicontrol>Variety</uicontrol> drop
-down list, click the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
-<alt>This graphic is the Browse button</alt></image> button next to the <uicontrol>Base
-type</uicontrol> field to specify a base type for the simple type.</cmd><info>The
-Set Type dialog lists all built-in and user-defined types currently available.
-You can change the <uicontrol>Scope</uicontrol> of the list by selecting one
-of the following options:<ul>
+<step><cmd>If you selected <uicontrol>atomic</uicontrol> from the <uicontrol>Variety</uicontrol> list,
+click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
+graphic is the Browse button</alt></image> next to the <uicontrol>Base type</uicontrol> field
+to specify a base type for the simple type.</cmd><info>The Set Type dialog
+box lists all built-in and user-defined types currently available. You can
+change the <uicontrol>Scope</uicontrol> of the list by selecting one of the
+following options:<ul>
 <li><uicontrol>Workspace</uicontrol>. Lists all of the types available in
 your workspace. </li>
 <li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available
@@ -58,13 +61,13 @@
 <li><uicontrol>Working Sets</uicontrol>. List all the types available within
 the selected working set.</li>
 </ul></info></step>
-<step><cmd>If you selected <uicontrol>list</uicontrol> from the <uicontrol>Variety</uicontrol> drop
-down list, click the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
-<alt>This graphic is the Browse button</alt></image> button next to the <uicontrol>Item
-type</uicontrol> field to specify a item type for the simple type.</cmd><info>The
-Set Type dialog lists all built-in and user-defined types currently available.
-You can change the <uicontrol>Scope</uicontrol> of the list by selecting one
-of the following options:<ul>
+<step><cmd>If you selected <uicontrol>list</uicontrol> from the <uicontrol>Variety</uicontrol> list,
+click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
+graphic is the Browse button</alt></image> next to the <uicontrol>Item type</uicontrol> field
+to specify a item type for the simple type.</cmd><info>The Set Type dialog
+box lists all built-in and user-defined types currently available. You can
+change the <uicontrol>Scope</uicontrol> of the list by selecting one of the
+following options:<ul>
 <li><uicontrol>Workspace</uicontrol>. Lists all of the types available in
 your workspace. </li>
 <li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available
@@ -74,11 +77,11 @@
 <li><uicontrol>Working Sets</uicontrol>. List all the types available within
 the selected working set.</li>
 </ul></info></step>
-<step><cmd>If you selected <uicontrol>union</uicontrol> from the <uicontrol>Variety</uicontrol> drop
-down list, click the <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
-<alt>This graphic is the Browse button</alt></image> button next to the <uicontrol>Member
-types</uicontrol> field to specify the member types for the simple type.</cmd>
-<info>You can select to add both <uicontrol>Built-in simple types</uicontrol> and <uicontrol>User-defined
+<step><cmd>If you selected <uicontrol>union</uicontrol> from the <uicontrol>Variety</uicontrol> list,
+click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif"><alt>This
+graphic is the Browse button</alt></image> next to the <uicontrol>Member types</uicontrol> field
+to specify the member types for the simple type.</cmd><info>You can select
+to add both <uicontrol>Built-in simple types</uicontrol> and <uicontrol>User-defined
 simple types</uicontrol> to the member types value list. </info></step>
 <step><cmd>Click the <uicontrol>Constraints</uicontrol> tab.</cmd><info>From
 here you will be able to set specific constraint values including length constraints,
@@ -89,20 +92,19 @@
 in the instance document. You can either add one enumeration or several enumerations
 at a time:</cmd><info><ul>
 <li>To add one enumeration at a time, under <uicontrol>Specific constraint
-values</uicontrol>, select the <uicontrol>Enumerations</uicontrol> radio button
-and click the <uicontrol>Add</uicontrol> button and specify a value for the
-enumeration.</li>
+values</uicontrol>, select <uicontrol>Enumerations</uicontrol> and click <uicontrol>Add</uicontrol> and
+specify a value for the enumeration.</li>
 <li>To add several enumerations at one time, follow these steps:<ol>
-<li>Select the <uicontrol>Enumerations</uicontrol> radio button.</li>
-<li>Click the <uicontrol>Add...</uicontrol> button.</li>
+<li>Select <uicontrol>Enumerations</uicontrol>.</li>
+<li>Click <uicontrol>Add</uicontrol>.</li>
 <li>Enter the value of each enumeration. Each value must be separated by the <uicontrol>Delimiter
 character</uicontrol>. For example: <codeph>First, Second</codeph> will create
 two enumerations, one with the value "First" and one with the value "Second".</li>
 <li>Select the <uicontrol>Preserve leading and trailing whitespace</uicontrol> check
 box if you want any white space around your enumeration values to be preserved.
-If, for example, you select this check box, the values of <codeph>First, Second</codeph> will
+If you select this check box, the values of <codeph>First, Second</codeph> will
 show up as "First" and " Second" (there is a space before Second) because
-you put a space before "Second" when entered the value.</li>
+you put a space before "Second" when entering the value.</li>
 <li>Click <uicontrol>OK</uicontrol>. Your enumerations will be created and
 appear in the Properties view.</li>
 </ol></li>
@@ -111,8 +113,8 @@
 values.</cmd><info>For example, you could restrict the field to only accept
 input which follows the pattern "five digits followed by two upper-case ASCII
 letters". To set a pattern constraint:<ol>
-<li>Select the <uicontrol>Patterns</uicontrol> radio button.</li>
-<li>Click the <uicontrol>Add...</uicontrol> button.</li>
+<li>Select <uicontrol>Patterns</uicontrol>.</li>
+<li>Click <uicontrol>Add</uicontrol>.</li>
 <li>Create the regular expression pattern you wish to use as your constraint
 using the <uicontrol>Regular Expression</uicontrol> wizard.</li>
 <li>Click <uicontrol>Finish</uicontrol>.</li>
@@ -121,9 +123,12 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this simple type.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000007829?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
index c1c8a3c..847830e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
 <task id="tedtschm" xml:lang="en-us">
 <title>Editing XML schema properties</title>
 <titlealts>
@@ -21,7 +23,7 @@
 <step><cmd>Create a new XML schema or double-click an existing schema in the
 Navigator view.</cmd><info> It will automatically open in the XML schema editor.</info>
 </step>
-<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol></cmd>
+<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol>.<?Pub Caret?></cmd>
 </step>
 <step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>
 </step>
@@ -34,9 +36,12 @@
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
 to provide any information about this XML schema.</cmd><info>The <uicontrol>Documentation</uicontrol> page
-is used for human readable material, such as a description, and the <uicontrol>App
-Info</uicontrol> page can be used to provide information for applications.</info>
-</step>
+is used for human readable material, such as a description.</info></step>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to
+add application information elements to your annotations of schema components.</cmd>
+<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the
+schema and add XML content to your annotations.</info></step>
 </steps>
 </taskbody>
 </task>
+<?Pub *0000002389?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
index e05f0a0..670f5d0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="timpschm" xml:lang="en-us">
 <title>Importing XML schemas</title>
 <titlealts>
@@ -17,7 +18,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 import an XML
-schema into the workbench, follow these steps:</p></context>
+schema into the workbench<?Pub Caret?>:</p></context>
 <steps>
 <step><cmd>Click <menucascade><uicontrol>File > Import</uicontrol></menucascade>.</cmd>
 </step>
@@ -30,3 +31,4 @@
 it to open it in the XML schema editor.</p></result>
 </taskbody>
 </task>
+<?Pub *0000001448?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
index d3dacdb..0d1c0b0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="refactoring" xml:lang="en-us">
 <title>Refactoring in XML Schema Files</title>
 <titlealts>
@@ -29,8 +30,8 @@
 for that artifact</info>
 <substeps>
 <substep><cmd>Type in the new name of the artifact.</cmd></substep>
-<substep><cmd><b><i>Optional:</i></b> Click Preview.</cmd><info>A window will
-open indicating all of the changes which will take place due to the refactoring.</info>
+<substep><cmd>(Optional) Click <b>Preview</b><?Pub Caret?>.</cmd><info>A window
+will open indicating all of the changes which will take place due to the refactoring.</info>
 </substep>
 <substep><cmd>Click <uicontrol>OK.</uicontrol></cmd></substep>
 </substeps>
@@ -91,3 +92,4 @@
 <postreq></postreq>
 </taskbody>
 </task>
+<?Pub *0000003131?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
index ca9d8ac..5dcffb0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.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">
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="tvdtschm" xml:lang="en-us">
 <title>Validating XML schemas</title>
 <titlealts>
@@ -16,7 +17,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 validate an XML
-schema, follow these steps:</p></context>
+schema:</p></context>
 <steps>
 <step><cmd>Right-click your file in the Navigator view and click <uicontrol>Run
 Validation</uicontrol>.</cmd></step>
@@ -24,8 +25,8 @@
 view to see what problems were logged. </cmd><info> <note>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
-> Validation</uicontrol></menucascade> from the project's pop-up menu and
-specifying the maximum number of error messages allowed.</note></info></step>
+> Validation</uicontrol></menucascade> <?Pub Caret?>and specifying the maximum
+number of error messages allowed.</note></info></step>
 </steps>
 <result><p>The XML schema support in the XML schema editor is based on the
 W3C XML Schema Recommendation Specification. The XML Schema specifications
@@ -56,3 +57,4 @@
 </link>
 </related-links>
 </task>
+<?Pub *0000003124?>