diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
index 45f35b6..56da80c 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -42,7 +42,7 @@
 <div><div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
 <div><a href="timpschm.html" title="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema.">Importing XML schemas</a></div>
-<div><a href="tnavsrc.html" title="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to.">Navigating XML schemas</a></div>
+<div><a href="tnavsrc.html" title="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to.">Navigating XML schemas</a></div>
 <div><a href="trefactrXSD.html" title="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts.">Refactoring in XML schemas</a></div>
 <div><a href="tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
 <div><a href="tdelscmp.html" title="If you have created any XML schema components you no longer need, you can delete them.">Deleting XML schema components</a></div>
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 9b3ad30..edaab3f 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "concept.dtd">
 <concept id="cxmlsced" xml:lang="en-us">
@@ -8,18 +8,18 @@
 <searchtitle>XML schema editor</searchtitle>
 </titlealts>
 <shortdesc>This product provides an XML schema editor for creating, viewing,
-and validating XML schemas. XML schemas are a formal specification
-of element names that indicates which elements are allowed in an XML file,
-and in which combinations. </shortdesc>
+and validating XML schemas. XML 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>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,
+<p>A schema is functionally equivalent to a DTD, but is written in XML. A
+schema also provides extended functionality such as data typing, inheritance,
 and presentation rules.</p>
-<p>For more information on XML schema, refer to:</p>
+<p>For more information on XML schema, see the following:</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>
@@ -49,8 +49,9 @@
 <li> (Source view only) <uicontrol>Smart Insert</uicontrol> or <uicontrol>Overwrite</uicontrol>.
 To toggle between these modes, press the <uicontrol>Insert</uicontrol> button
 on your keyboard.</li>
-<li> <uicontrol>Line</uicontrol> and <uicontrol>column</uicontrol> number. </li>
+<li> Line and column number (displayed in the format <?Pub Caret?><userinput>column
+# : line #</userinput>)</li>
 </ul></section>
 </conbody>
 </concept>
-<?Pub *0000002883?>
+<?Pub *0000002906?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
index 869ad39..56edaf1 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -31,15 +31,15 @@
 
 
 <div><p>This product provides an XML schema editor for creating, viewing,
-and validating XML schemas. XML schemas are a formal specification
-of element names that indicates which elements are allowed in an XML file,
-and in which combinations. </p>
+and validating XML schemas. XML schemas are a formal specification of element
+names that indicates which elements are allowed in an XML file, and in which
+combinations. </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,
+<p>A schema is functionally equivalent to a DTD, but is written in XML. A
+schema also provides extended functionality such as data typing, inheritance,
 and presentation rules.</p>
 
-<p>For more information on XML schema, refer to:</p>
+<p>For more information on XML schema, see the following:</p>
 
 <ul>
 <li> <a href="http://www.w3.org/TR/xmlschema-0/" target="_blank">http://www.w3.org/TR/xmlschema-0/</a> </li>
@@ -90,7 +90,8 @@
 To toggle between these modes, press the <span class="uicontrol">Insert</span> button
 on your keyboard.</li>
 
-<li> <span class="uicontrol">Line</span> and <span class="uicontrol">column</span> number. </li>
+<li> Line and column number (displayed in the format <kbd class="userinput">column
+# : line #</kbd>)</li>
 
 </ul>
 </div>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
index 1a5cc54..57869bf 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
index 0237e98..315331d 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
 <reference id="rnmspc" xml:lang="en-us">
 <title>XML namespaces</title>
 <titlealts>
@@ -14,8 +15,8 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section>XML namespaces are defined by a W3C recommendation, dating 14 January
-1999, called <xref format="html" href="http://www.w3.org/TR/REC-xml-names/"
+<section>XML namespaces are defined by a W3C recommendation, dating 16 August
+2006, called <xref format="html" href="http://www.w3.org/TR/2006/REC-xml-names-20060816/"
 scope="external">Namespaces in XML</xref>. XML tag names should be globally
 unique, as well as short for performance reasons. In order to resolve this
 conflict, the W3C namespace recommendation defines an attribute <b>xmlns</b> which
@@ -30,11 +31,11 @@
 	&lt;acct:name>Corporation&lt;/acct:name>
 	&lt;acct:order acct:ref="5566"/>
 	&lt;acct:status>invoice&lt;/acct:status>
-&lt;/acct:customer>  </codeblock> </p><p>The <i>namespace definition</i> in
-the first line assigns the namespace <i>http://www.my.com/acct-REV10</i> to
-the prefix. This prefix is used on the element names such as name in order
-to attach them to the namespace. A second application, for example, a fulfillment
-system, can assign a different namespace to its customer elements:</p><p><codeblock>&lt;ful:customer xmlns:ful="http://www.your.com/ful">
+&lt;/acct:customer>  </codeblock> </p><p>The namespace definition in the first
+line assigns the namespace http://www.my.com/acct-REV10 to the prefix. This
+prefix is used on the element names such as name in order to attach them to
+the namespace. A second application, for example, a fulfillment system, can
+assign a different namespace to its customer elements:</p><p><codeblock>&lt;ful:customer xmlns:ful="http://www.your.com/ful">
 	&lt;ful:name>Corporation&lt;/ful:name>
 	&lt;ful:order ful:ref="A98756"/>
 	&lt;ful:status>shipped&lt;/ful:status>
@@ -46,13 +47,13 @@
 &lt;order acct:ref="5566"/>
 &lt;status>invoice&lt;/status>
 &lt;/customer></codeblock></p><p>In this example, all tags in the customer
-record are qualified to reside in the namespace <i>http://www.my.com/acct-REV10.</i> No
-explicit prefix is needed because the default namespace is used. Note that
+record are qualified to reside in the namespace http://www.my.com/acct-REV10.
+No explicit prefix is needed because the default namespace is used. Note that
 the default namespace applies to any attributes definitions.</p></section>
 <section><title>XML schemas and namespaces</title><p>In the following XML
 schema, the default namespace for the schema is defined as the standard XML
-schema namespace <i>http://www.w3.org/2001/XMLSchem</i>a; there is also a
-schema specific namespace <i>http://www.ibm.com</i>.</p><p><codeblock>&lt;?xml version="1.0"?>
+schema namespace http://www.w3.org/2001/XMLSchema; there is also a schema
+specific namespace http://www.ibm.com.</p><p><codeblock>&lt;?xml version="1.0"?>
 &lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com">
  &lt;simpleType name="ZipCodeType">
  &lt;restriction base="integer">
@@ -99,14 +100,14 @@
 &lt;/complexType>
 &lt;element name="MyAddress" type="x:AddressType">&lt;/element>
 &lt;/schema> </codeblock> </p><p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <i>unqualified</i>.</p><p><codeblock>&lt;?xml version="1.0"?>
+this schema looks like this. Local elements and attributes are unqualified.</p><p><codeblock>&lt;?xml version="1.0"?>
 &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd ">
 &lt;name>Peter Smith&lt;/name>
-&lt;/x:MyAddress> </codeblock></p><p>When local elements (such as the <i>"name"</i> element)
-and attributes are unqualified in an XML file, then only the root element
-is qualified. So, in this example, the <i>"x"</i> namespace prefix is assigned
-to the root element <i>"MyAddress"</i>, associating it with the namespace <i>"http://www.ibm.com",</i> but
-the<i>"x"</i> prefix is not assigned to the local element <i>"name"</i>.</p></section>
+&lt;/x:MyAddress> </codeblock></p><p>When local elements (such as the "name"
+element) and attributes are unqualified in an XML file, then only the root
+element is qualified. So, in this example, the "x" namespace prefix is assigned
+to the root element "MyAddress", associating it with the namespace "http://www.ibm.com",
+but the"x" prefix is not assigned to the local element "name".</p></section>
 <section><title>Sample 2 - A schema with both a default and target namespace
 and qualified locals</title><p><codeblock>&lt;?xml version="1.0"?>
 &lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified">
@@ -117,25 +118,24 @@
 &lt;/complexType>
 &lt;element name="MyAddress" type="x:AddressType">&lt;/element>
  &lt;/schema>  </codeblock></p><p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <i>qualified</i> This
+this schema looks like this. Local elements and attributes are qualified This
 is because the elementFormDefault attribute is set to qualified in the XML
 schema.</p><p><codeblock>&lt;?xml version="1.0"?>
   &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.ibm.com x.xsd "> 
 &lt;x:name>Peter Smith&lt;/x:name>
- &lt;/x:MyAddress></codeblock> </p><p>In this example, the <i>"x"</i> namespace
-prefix is assigned to both the root element <i>"MyAddress"</i> and the local
-element <i>"name"</i>, associating them with the namespace <i>"http://www.ibm.com",</i>.</p></section>
+ &lt;/x:MyAddress></codeblock> </p><p>In this example, the "x" namespace prefix
+is assigned to both the root element "MyAddress" and the local element "name",
+associating them with the namespace "http://www.ibm.com",.</p></section>
 <section><title>Sample 3 - Schema with target Namespace, and explicitly defines
 xmlns:xsd</title><p>This XML schema adds this attribute:  </p><codeph>xmlns:xsd="http://www.w3.org/2001/XMLSchema </codeph><p>What
 this means is that each of the constructs that are defined by the XML schema
-language will need to be qualified with the <varname>"xsd"</varname> prefix.
-For example, xsd:complexType and  xsd:string</p><p>. Note that you can chose
-any other prefixes such as <varname>"xs"</varname> or <varname>"foobar"</varname> in
-your declaration and usage.</p><p>You can specify this prefix in the XML schema
-preferences page. For more information, refer to the related tasks.</p><p>All
-user defined types belong to the namespace  http://www.ibm.com as defined
-by the targetNamespace attribute, and the prefix is <i>"x"</i> as defined
+language will need to be qualified with the "xsd" prefix. For example, xsd:complexType
+and  xsd:string</p><p>. Note that you can chose any other prefixes such as
+"xs" or "foobar" in your declaration and usage.</p><p>You can specify this
+prefix in the XML schema preferences page. For more information, refer to
+the related tasks.</p><p>All user defined types belong to the namespace  http://www.ibm.com
+as defined by the targetNamespace attribute, and the prefix is "x" as defined
 by the xmlns:x attribute.</p><p><codeblock>&lt;?xml version="1.0"?>
 &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com">
 &lt;xsd:complexType name="AddressType">
@@ -145,7 +145,7 @@
  &lt;/xsd:complexType>
  &lt;xsd:element name="MyAddress" type="x:AddressType">&lt;/xsd:element>
 &lt;/xsd:schema></codeblock> </p><p>A valid XML instance document created
-from this schema looks like this. Local elements and attributes are <i>unqualified</i>.
+from this schema looks like this. Local elements and attributes are unqualified.
 The semantics of qualification is the same as Sample 1.</p><p><codeblock>&lt;?xml version="1.0"?>
  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd ">
 &lt;name>Peter Smith&lt;/name>
@@ -153,9 +153,9 @@
 <section><title>Sample 4 - Schema with undeclared target Namespace that explicitly
 defines xmlns:xsd</title><p>This XML schema has no target namespace for itself.
 In this case, it is highly recommended that all XML schema constructs be explicitly
-qualified with a prefix such as <i>"xsd"</i>. The definitions and declarations
-from this schema such as <i>AddressType</i> are referenced without namespace
-qualification since there is no namespace prefix.  </p><p><codeblock>&lt;?xml version="1.0"?>
+qualified with a prefix such as "xsd". The definitions and declarations from
+this schema such as AddressType are referenced without namespace qualification
+since there is no namespace prefix.  </p><p><codeblock>&lt;?xml version="1.0"?>
 &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 &lt;xsd:complexType name="AddressType">
 &lt;xsd:sequence>
@@ -166,7 +166,7 @@
 &lt;/xsd:complexType>
 &lt;xsd:element name="MyAddress" type="AddressType">&lt;/xsd:element> 
 &lt;/xsd:schema> </codeblock></p><p>A valid XML instance document created
-from the schema looks like this. All elements are <i>unqualified</i>.</p><p><codeblock>&lt;?xml version="1.0"?>
+from the schema looks like this. All elements are unqualified.</p><p><codeblock>&lt;?xml version="1.0"?>
 &lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd">
 &lt;name>name&lt;/name>
 &lt;/MyAddress></codeblock>  </p></section>
@@ -186,4 +186,5 @@
 &lt;name>name&lt;/name>
  &lt;/MyAddress>  </codeblock> </p></section>
 </refbody>
-</reference>
+</reference><?Pub Caret?>
+<?Pub *0000012002?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
index f4a0b4f..d9c46c3 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -13,6 +13,7 @@
 <meta name="description" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
 <meta content="XML namespaces, overview" name="DC.subject" />
 <meta content="XML namespaces, overview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tedtpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rnmspc" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -31,8 +32,8 @@
 reference, which are used in XML documents as element types and attribute
 names.</p>
 
-<div class="section">XML namespaces are defined by a W3C recommendation, dating 14 January
-1999, called <a href="http://www.w3.org/TR/REC-xml-names/" target="_blank">Namespaces in XML</a>. XML tag names should be globally
+<div class="section">XML namespaces are defined by a W3C recommendation, dating 16 August
+2006, called <a href="http://www.w3.org/TR/2006/REC-xml-names-20060816/" target="_blank">Namespaces in XML</a>. XML tag names should be globally
 unique, as well as short for performance reasons. In order to resolve this
 conflict, the W3C namespace recommendation defines an attribute <strong>xmlns</strong> which
 can amend any XML element. If it is present in an element, it identifies the
@@ -52,11 +53,11 @@
 	&lt;acct:status&gt;invoice&lt;/acct:status&gt;
 &lt;/acct:customer&gt;  </pre>
  </div>
-<p>The <em>namespace definition</em> in
-the first line assigns the namespace <em>http://www.my.com/acct-REV10</em> to
-the prefix. This prefix is used on the element names such as name in order
-to attach them to the namespace. A second application, for example, a fulfillment
-system, can assign a different namespace to its customer elements:</p>
+<p>The namespace definition in the first
+line assigns the namespace http://www.my.com/acct-REV10 to the prefix. This
+prefix is used on the element names such as name in order to attach them to
+the namespace. A second application, for example, a fulfillment system, can
+assign a different namespace to its customer elements:</p>
 <div class="p"><pre>&lt;ful:customer xmlns:ful="http://www.your.com/ful"&gt;
 	&lt;ful:name&gt;Corporation&lt;/ful:name&gt;
 	&lt;ful:order ful:ref="A98756"/&gt;
@@ -74,15 +75,15 @@
 &lt;/customer&gt;</pre>
 </div>
 <p>In this example, all tags in the customer
-record are qualified to reside in the namespace <em>http://www.my.com/acct-REV10.</em> No
-explicit prefix is needed because the default namespace is used. Note that
+record are qualified to reside in the namespace http://www.my.com/acct-REV10.
+No explicit prefix is needed because the default namespace is used. Note that
 the default namespace applies to any attributes definitions.</p>
 </div>
 
 <div class="section"><h4 class="sectiontitle">XML schemas and namespaces</h4><p>In the following XML
 schema, the default namespace for the schema is defined as the standard XML
-schema namespace <em>http://www.w3.org/2001/XMLSchem</em>a; there is also a
-schema specific namespace <em>http://www.ibm.com</em>.</p>
+schema namespace http://www.w3.org/2001/XMLSchema; there is also a schema
+specific namespace http://www.ibm.com.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
 &lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com"&gt;
  &lt;simpleType name="ZipCodeType"&gt;
@@ -142,17 +143,17 @@
 &lt;/schema&gt; </pre>
  </div>
 <p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <em>unqualified</em>.</p>
+this schema looks like this. Local elements and attributes are unqualified.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
 &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
 &lt;name&gt;Peter Smith&lt;/name&gt;
 &lt;/x:MyAddress&gt; </pre>
 </div>
-<p>When local elements (such as the <em>"name"</em> element)
-and attributes are unqualified in an XML file, then only the root element
-is qualified. So, in this example, the <em>"x"</em> namespace prefix is assigned
-to the root element <em>"MyAddress"</em>, associating it with the namespace <em>"http://www.ibm.com",</em> but
-the<em>"x"</em> prefix is not assigned to the local element <em>"name"</em>.</p>
+<p>When local elements (such as the "name"
+element) and attributes are unqualified in an XML file, then only the root
+element is qualified. So, in this example, the "x" namespace prefix is assigned
+to the root element "MyAddress", associating it with the namespace "http://www.ibm.com",
+but the"x" prefix is not assigned to the local element "name".</p>
 </div>
 
 <div class="section"><h4 class="sectiontitle">Sample 2 - A schema with both a default and target namespace
@@ -167,7 +168,7 @@
  &lt;/schema&gt;  </pre>
 </div>
 <p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are <em>qualified</em> This
+this schema looks like this. Local elements and attributes are qualified This
 is because the elementFormDefault attribute is set to qualified in the XML
 schema.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
@@ -176,25 +177,24 @@
 &lt;x:name&gt;Peter Smith&lt;/x:name&gt;
  &lt;/x:MyAddress&gt;</pre>
  </div>
-<p>In this example, the <em>"x"</em> namespace
-prefix is assigned to both the root element <em>"MyAddress"</em> and the local
-element <em>"name"</em>, associating them with the namespace <em>"http://www.ibm.com",</em>.</p>
+<p>In this example, the "x" namespace prefix
+is assigned to both the root element "MyAddress" and the local element "name",
+associating them with the namespace "http://www.ibm.com",.</p>
 </div>
 
 <div class="section"><h4 class="sectiontitle">Sample 3 - Schema with target Namespace, and explicitly defines
 xmlns:xsd</h4><p>This XML schema adds this attribute:  </p>
 <samp class="codeph">xmlns:xsd="http://www.w3.org/2001/XMLSchema </samp><p>What
 this means is that each of the constructs that are defined by the XML schema
-language will need to be qualified with the <var class="varname">"xsd"</var> prefix.
-For example, xsd:complexType and  xsd:string</p>
-<p>. Note that you can chose
-any other prefixes such as <var class="varname">"xs"</var> or <var class="varname">"foobar"</var> in
-your declaration and usage.</p>
-<p>You can specify this prefix in the XML schema
-preferences page. For more information, refer to the related tasks.</p>
-<p>All
-user defined types belong to the namespace  http://www.ibm.com as defined
-by the targetNamespace attribute, and the prefix is <em>"x"</em> as defined
+language will need to be qualified with the "xsd" prefix. For example, xsd:complexType
+and  xsd:string</p>
+<p>. Note that you can chose any other prefixes such as
+"xs" or "foobar" in your declaration and usage.</p>
+<p>You can specify this
+prefix in the XML schema preferences page. For more information, refer to
+the related tasks.</p>
+<p>All user defined types belong to the namespace  http://www.ibm.com
+as defined by the targetNamespace attribute, and the prefix is "x" as defined
 by the xmlns:x attribute.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
 &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
@@ -207,7 +207,7 @@
 &lt;/xsd:schema&gt;</pre>
  </div>
 <p>A valid XML instance document created
-from this schema looks like this. Local elements and attributes are <em>unqualified</em>.
+from this schema looks like this. Local elements and attributes are unqualified.
 The semantics of qualification is the same as Sample 1.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
@@ -219,9 +219,9 @@
 <div class="section"><h4 class="sectiontitle">Sample 4 - Schema with undeclared target Namespace that explicitly
 defines xmlns:xsd</h4><p>This XML schema has no target namespace for itself.
 In this case, it is highly recommended that all XML schema constructs be explicitly
-qualified with a prefix such as <em>"xsd"</em>. The definitions and declarations
-from this schema such as <em>AddressType</em> are referenced without namespace
-qualification since there is no namespace prefix.  </p>
+qualified with a prefix such as "xsd". The definitions and declarations from
+this schema such as AddressType are referenced without namespace qualification
+since there is no namespace prefix.  </p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
 &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
 &lt;xsd:complexType name="AddressType"&gt;
@@ -235,7 +235,7 @@
 &lt;/xsd:schema&gt; </pre>
 </div>
 <p>A valid XML instance document created
-from the schema looks like this. All elements are <em>unqualified</em>.</p>
+from the schema looks like this. All elements are unqualified.</p>
 <div class="p"><pre>&lt;?xml version="1.0"?&gt;
 &lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd"&gt;
 &lt;name&gt;name&lt;/name&gt;
@@ -267,6 +267,10 @@
 
 </div>
 
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
index 97d9893..812b302 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
 <reference id="rrefintg" xml:lang="en-us">
 <title>Referential integrity in the XML schema editor</title>
 <titlealts>
@@ -20,7 +21,7 @@
  &lt;element name="comment" type="string">
 	&lt;complexType name="Items">
 		&lt;sequence>
-				&lt;element ref="comment">
+<?Pub Caret?>				&lt;element ref="comment">
 		 &lt;/sequence>
 	 &lt;/complexType>
 &lt;/schema></codeblock></p><p>If the global element (comment) was deleted,
@@ -34,11 +35,12 @@
 <section><title>Deleting included and imported schema</title><p>If an included
 or imported schema is deleted, you must manually reset the following type
 references as appropriate: <ul>
-<li>Global element and element's type</li>
-<li>Attribute type</li>
-<li>Complex type derivation</li>
-<li>Simple type derivation </li>
+<li>Global element and element's type.</li>
+<li>Attribute type.</li>
+<li>Complex type derivation.</li>
+<li>Simple type derivation.</li>
 </ul>They will not automatically be reset if an included or imported schema
 is deleted.</p></section>
 </refbody>
 </reference>
+<?Pub *0000002046?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
index e319a3b..33654b0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -60,13 +60,13 @@
 <div class="section"><h4 class="sectiontitle">Deleting included and imported schema</h4><div class="p">If an included
 or imported schema is deleted, you must manually reset the following type
 references as appropriate: <ul>
-<li>Global element and element's type</li>
+<li>Global element and element's type.</li>
 
-<li>Attribute type</li>
+<li>Attribute type.</li>
 
-<li>Complex type derivation</li>
+<li>Complex type derivation.</li>
 
-<li>Simple type derivation </li>
+<li>Simple type derivation.</li>
 
 </ul>
 They will not automatically be reset if an included or imported schema
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
index 92f68a6..52ee7e1 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Icons used in the XML schema editor" />
 <meta name="abstract" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
 <meta name="description" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
-<meta content="XML schema editor, icons, Icons" name="DC.subject" />
-<meta content="XML schema editor, icons, Icons" name="keywords" />
+<meta content="XML schema editor, icons" name="DC.subject" />
+<meta content="XML schema editor, icons" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="ricons" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
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 336ae4e..8ed1076 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <task id="taddagrp" xml:lang="en-us">
@@ -19,16 +19,16 @@
 <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 attribute
-group to an XML schema, follow these steps:</p></context>
+group to an XML schema, complete the following steps:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
-<step><cmd>In the Outline view, right-click the <uicontrol>Attribute Groups</uicontrol> folder
+<step><cmd>In the Outline view, right-click the <uicontrol>Attributes</uicontrol> folder
 and click  <uicontrol>Add Attribute Group</uicontrol>.</cmd><info>It appears
-in the <uicontrol>Attribute Groups</uicontrol> folder.</info></step>
+in the <uicontrol>Attributes</uicontrol> folder.</info></step>
 <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>
+for the attribute group and click <uicontrol>OK</uicontrol>.</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>
@@ -45,7 +45,7 @@
 your workspace. </li>
 <li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types available
 in the project that contains your file. </li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
+<li><uicontrol>Current Resource</uicontrol> (default). List all of the types
 available in your current file.</li>
 <li><uicontrol>Working Sets</uicontrol>. List all the types available within
 the selected working set.</li>
@@ -57,17 +57,17 @@
 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. Select the reference, then select the attribute group you want
-it to reference in the Properties view, from the<uicontrol>Ref</uicontrol> menu.</info>
+declaration. Select the reference, then in the Properties view, select the
+attribute you want it to reference from the<uicontrol>Reference</uicontrol> drop-down</info>
 </step>
 <step><cmd>An attribute group reference provides a reference to an attribute
 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. 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>
+context of the referencing declaration. Select the reference, then in the
+Properties view, select the attribute group you want it to reference from
+the<uicontrol>Reference</uicontrol> drop-down.</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,
@@ -75,26 +75,25 @@
 <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 <uicontrol>namespace</uicontrol> 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
+<choice>For a <uicontrol>namespace</uicontrol> 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
+<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
+<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
+<li><b>skip</b>: t<?Pub Caret?>he 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>
+<li><b>strict</b>: the XML processor will validate all the attribute content.</li>
 </ul></choice>
 </choices>
 </step>
 </steps>
 </taskbody>
 </task>
-<?Pub *0000005769?>
+<?Pub *0000005543?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
index 500b3b0..6343b7e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding attribute groups" />
 <meta name="abstract" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
 <meta name="description" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
-<meta content="XML schema editor, adding, attribute groups, attributes groups, XML schema files, attribute groups, XML schema files, attributes groups" name="DC.subject" />
-<meta content="XML schema editor, adding, attribute groups, attributes groups, XML schema files, attribute groups, XML schema files, attributes groups" name="keywords" />
+<meta content="XML schema editor, attribute groups, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, attribute groups, XML schema files" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddagrp" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -35,20 +35,20 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To add an attribute
-group to an XML schema, follow these steps:</p>
+group to an XML schema, complete the following steps:</p>
 </div>
 
 <ol>
 <li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
 
-<li class="stepexpand"><span>In the Outline view, right-click the <span class="uicontrol">Attribute Groups</span> folder
+<li class="stepexpand"><span>In the Outline view, right-click the <span class="uicontrol">Attributes</span> folder
 and click  <span class="uicontrol">Add Attribute Group</span>.</span> It appears
-in the <span class="uicontrol">Attribute Groups</span> folder.</li>
+in the <span class="uicontrol">Attributes</span> folder.</li>
 
 <li class="stepexpand"><span>Select your new group, and in the Design view, right-click the
 attribute group and select <span class="menucascade"><span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span>
 </span>. In the <span class="uicontrol">New Name</span> field, type a name
-for the attribute group.</span></li>
+for the attribute group and click <span class="uicontrol">OK</span>.</span></li>
 
 <li class="stepexpand"><span>To add an attribute, right-click your attribute group in the Outline
 view, click <span class="uicontrol">Add Attribute</span>.</span> The attribute
@@ -69,7 +69,7 @@
 <li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
 in the project that contains your file. </li>
 
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
+<li><span class="uicontrol">Current Resource</span> (default). List all of the types
 available in your current file.</li>
 
 <li><span class="uicontrol">Working Sets</span>. List all the types available within
@@ -87,8 +87,8 @@
 type containing the element, and click <span class="uicontrol">Add Attribute Ref</span>.</span>
  A declaration that references a global attribute enables the referenced
 attribute to appear in the instance document 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<span class="uicontrol">Ref</span> menu.
+declaration. Select the reference, then in the Properties view, select the
+attribute you want it to reference from the<span class="uicontrol">Reference</span> drop-down
 </li>
 
 <li class="stepexpand"><span>An attribute group reference provides a reference to an attribute
@@ -96,9 +96,9 @@
 the complex type containing the element, and click <span class="uicontrol">Add Attribute
 Group Ref</span>.</span> A declaration that references a global attribute
 enables the referenced attribute to appear in the instance document 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<span class="uicontrol">Ref</span> menu.</li>
+context of the referencing declaration. Select the reference, then in the
+Properties view, select the attribute group you want it to reference from
+the<span class="uicontrol">Reference</span> drop-down.</li>
 
 <li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
 to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
@@ -107,30 +107,29 @@
  The <samp class="codeph">any</samp> appears below the attribute group in the Outline
 view. You can specify the following values for an <samp class="codeph">any</samp> attribute:
 <ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
+<li>For a <span class="uicontrol">namespace</span> value, you can select:<ul>
+<li><strong>##any</strong>: this allows any well-formed XML from any namespace.</li>
 
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
+<li><strong>##local </strong>: this allows any well-formed XML that is not declared
 to be in a namespace.</li>
 
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
+<li><strong>##other</strong>: this allows any well-formed XML that is not from the target
 namespace of the type being defined.</li>
 
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
+<li><strong>##targetNamespace </strong>: this is shorthand for the target namespace
 of the type being defined.</li>
 
 </ul>
 </li>
 
 <li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
+<li><strong>skip</strong>: the XML processor will not validate the attribute
+content at all.</li>
 
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
+<li><strong>lax</strong>: the XML processor will validate the attribute content as much
 as it can.</li>
 
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
+<li><strong>strict</strong>: the XML processor will validate all the attribute content.</li>
 
 </ul>
 </li>
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 5b2c285..ae77e6b 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -20,45 +20,46 @@
 <taskbody>
 <context><p>For example:</p><p><codeblock>&lt;element name = "MyWebPage">
 &lt;complexType>
-&lt;any namespace ="http://www.w3.org/1999/xhtml>
- &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/>
+&lt;any namespace="http://www.w3.org/1999/xhtml"
+   minOccurs="1" maxOccurs="unbounded" processContents="skip"/>
 &lt;/complexType>
 &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:</p></context>
+will also work in many other perspectives.</p><p>To add an <codeph>any</codeph> element,
+complete the following steps:</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 <uicontrol>namespace</uicontrol> value,
+<step><cmd>In the Properties view, for a <uicontrol>namespace</uicontrol> 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
+<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
+<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
+<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
+<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>
+<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;
+<step><cmd>The <uicontrol>Minimum Occurrence</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;
 otherwise, select <uicontrol>1</uicontrol>. </cmd></step>
-<step><cmd>The <uicontrol>maxOccurs</uicontrol> value is the maximum number
-of times an <codeph>any</codeph> element can appear in an instance document.
-You can select <uicontrol>0</uicontrol>, <uicontrol>1</uicontrol>, or, to
-indicate there is no maximum number of occurrences, <uicontrol>unbounded</uicontrol>.</cmd>
+<step><cmd>The <uicontrol>Maximum Occurrence</uicontrol> value is the maximum
+number of times an <codeph>any</codeph> element can appear in an instance
+document. You can select <uicontrol>0</uicontrol>, <uicontrol>1</uicontrol>,
+or, to indicate there is no maximum number of occurrences, <uicontrol>unbounded</uicontrol>.</cmd>
 </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
@@ -68,9 +69,9 @@
 <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>
+<postreq><draft-comment>(<?Pub Caret1?>c) Copyright 2001, World Wide Web (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et
+en Automatique, Keio University).</draft-comment></postreq>
 </taskbody>
 </task>
-<?Pub *0000004291?>
+<?Pub *0000004081?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
index 8540ecb..6d2c595 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding an any element" />
 <meta name="abstract" content="You can use the any 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." />
 <meta name="description" content="You can use the any 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." />
-<meta content="XML schema editor, adding, an any element, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, an any element, XML schema files" name="keywords" />
+<meta content="XML schema editor, adding an any element, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, adding an any element, XML schema files" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddanye" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -35,8 +35,8 @@
 <div class="section"><p>For example:</p>
 <div class="p"><pre>&lt;element name = "MyWebPage"&gt;
 &lt;complexType&gt;
-&lt;any namespace ="http://www.w3.org/1999/xhtml&gt;
- &lt; minOccurs="1" maxOccurs="unbounded" processContents="skip"/&gt;
+&lt;any namespace="http://www.w3.org/1999/xhtml"
+   minOccurs="1" maxOccurs="unbounded" processContents="skip"/&gt;
 &lt;/complexType&gt;
 &lt;/element&gt;</pre>
 </div>
@@ -45,7 +45,8 @@
 <p>The
 following instructions were written for the Resource perspective, but they
 will also work in many other perspectives.</p>
-<p>To add an <samp class="codeph">any</samp> element:</p>
+<p>To add an <samp class="codeph">any</samp> element,
+complete the following steps:</p>
 </div>
 
 <ol>
@@ -54,18 +55,18 @@
 
 <li class="stepexpand"><span>Select the new <samp class="codeph">any</samp> element.</span></li>
 
-<li class="stepexpand"><span>In the Properties view of the schema editor, for a <span class="uicontrol">namespace</span> value,
+<li class="stepexpand"><span>In the Properties view, for a <span class="uicontrol">namespace</span> value,
 you can select:</span>
 <ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
+<li><strong>##any</strong>: this allows any well-formed XML from any namespace.</li>
 
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
+<li><strong>##local </strong>: this allows any well-formed XML that is not declared
 to be in a namespace.</li>
 
-<li><strong>##other </strong>. This allows any well-formed XML that is not from
+<li><strong>##other </strong>: this allows any well-formed XML that is not from
 the target namespace of the type being defined.</li>
 
-<li><strong>##targetNamespace</strong>. This is shorthand for the target namespace
+<li><strong>##targetNamespace</strong>: this is shorthand for the target namespace
 of the type being defined.</li>
 
 </ul>
@@ -74,26 +75,26 @@
 
 <li class="stepexpand"><span>For a <span class="uicontrol">processContents</span> value, you can select:</span>
 <ul>
-<li><strong>skip</strong>. The XML processor will not validate the content at all.</li>
+<li><strong>skip</strong>: the XML processor will not validate the content at all.</li>
 
-<li><strong>lax</strong>. The XML processor will validate the content as much as
+<li><strong>lax</strong>: the XML processor will validate the content as much as
 it can.</li>
 
-<li><strong>strict</strong>. The XML processor will validate all the content.</li>
+<li><strong>strict</strong>: the XML processor will validate all the content.</li>
 
 </ul>
 
 </li>
 
-<li class="stepexpand"><span>The <span class="uicontrol">minOccurs</span> value is the number of times
-the <samp class="codeph">any</samp> element must appear in an instance document. You
-can select <span class="uicontrol">0</span> if you want the element to be optional;
+<li class="stepexpand"><span>The <span class="uicontrol">Minimum Occurrence</span> value is the number
+of times the <samp class="codeph">any</samp> element must appear in an instance document.
+You can select <span class="uicontrol">0</span> if you want the element to be optional;
 otherwise, select <span class="uicontrol">1</span>. </span></li>
 
-<li class="stepexpand"><span>The <span class="uicontrol">maxOccurs</span> value is the maximum number
-of times an <samp class="codeph">any</samp> element can appear in an instance document.
-You can select <span class="uicontrol">0</span>, <span class="uicontrol">1</span>, or, to
-indicate there is no maximum number of occurrences, <span class="uicontrol">unbounded</span>.</span>
+<li class="stepexpand"><span>The <span class="uicontrol">Maximum Occurrence</span> value is the maximum
+number of times an <samp class="codeph">any</samp> element can appear in an instance
+document. You can select <span class="uicontrol">0</span>, <span class="uicontrol">1</span>,
+or, to indicate there is no maximum number of occurrences, <span class="uicontrol">unbounded</span>.</span>
 </li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
@@ -107,10 +108,7 @@
 
 </ol>
 
-<div class="section"><p>(c) Copyright 2001, World Wide Web (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University).</p>
-</div>
+<div class="section" />
 
 </div>
 
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 f5d45f7..7f69dda 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -31,8 +31,8 @@
 in the content model can appear more than once.</li>
 </ul></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 content
-model to an element, global element, complex type, or group, follow these
-steps:</p></context>
+model to an element, global element, complex type, or group, complete the
+following steps:</p></context>
 <steps>
 <step><cmd>In the Design view, select your complex type, or group:</cmd>
 <choices>
@@ -49,27 +49,27 @@
 <choice>Your group is automatically created with a sequence content model
 child. Expand it in the Outline view to see it and select it. In the Properties
 view, you can select to change it to a <uicontrol>choice</uicontrol> or <uicontrol>all</uicontrol> content
-model by selecting these options from the <uicontrol>Kind</uicontrol> menu.</choice>
+model by selecting these options from the <uicontrol>Kind</uicontrol> drop-down.</choice>
 </choices>
 </step>
-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>MinOccurs</uicontrol> field.</cmd>
-<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 importance="optional"><cmd>Select the appropriate value in the <uicontrol>Minimum
+Occurr<?Pub Caret?>ence</uicontrol> field.</cmd><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 importance="optional"><cmd>Select the appropriate value in the <uicontrol>Maximum
+Occurrence</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.</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>You can add the following items to a content object model. </p><ul>
+<postreq><p>You can add the following items to a content object model: </p><ul>
 <li>Another content model.</li>
 <li>A group reference which enables the referenced group to appear in the
 instance document in the context of the referencing declaration. This menu
@@ -84,4 +84,4 @@
 </ul></postreq>
 </taskbody>
 </task>
-<?Pub *0000005317?>
+<?Pub *0000005101?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
index 1e0afe1..adfb02e 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding content models" />
 <meta name="abstract" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
 <meta name="description" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
-<meta content="XML schema editor, adding, content models, XML schema files, content models, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, content models, XML schema files, content models, XML schema files" name="keywords" />
+<meta content="XML schema editor, content models, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, content models, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
@@ -55,8 +55,8 @@
 <p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To add a content
-model to an element, global element, complex type, or group, follow these
-steps:</p>
+model to an element, global element, complex type, or group, complete the
+following steps:</p>
 </div>
 
 <ol>
@@ -76,26 +76,26 @@
 <li>Your group is automatically created with a sequence content model
 child. Expand it in the Outline view to see it and select it. In the Properties
 view, you can select to change it to a <span class="uicontrol">choice</span> or <span class="uicontrol">all</span> content
-model by selecting these options from the <span class="uicontrol">Kind</span> menu.</li>
+model by selecting these options from the <span class="uicontrol">Kind</span> drop-down.</li>
 
 </ul>
 
 </li>
 
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span>
- This is the minimum number of times the content model must appear. If
-you want the content model to be optional, select <span class="uicontrol">0</span>.
-Otherwise, select <span class="uicontrol">1</span>. </li>
+<li class="stepexpand"><strong>Optional: </strong><span>Select the appropriate value in the <span class="uicontrol">Minimum
+Occurrence</span> field.</span> This is the minimum
+number of times the content model must appear. If you want the content model
+to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
+</li>
 
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times a content model can appear. You
-can select <span class="uicontrol">unbounded</span> to indicate there is no maximum
-number of occurrences.</li>
+<li class="stepexpand"><strong>Optional: </strong><span>Select the appropriate value in the <span class="uicontrol">Maximum
+Occurrence</span> field.</span> This is the maximum number of times
+a content model can appear. You can select <span class="uicontrol">unbounded</span> to
+indicate there is no maximum number of occurrences.</li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
 to provide any information about this content model.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
+is used for human readable material, such as a description.</li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
 add application information elements to your annotations of schema components.</span>
@@ -104,7 +104,7 @@
 
 </ol>
 
-<div class="section"><p>You can add the following items to a content object model. </p>
+<div class="section"><p>You can add the following items to a content object model: </p>
 <ul>
 <li>Another content model.</li>
 
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 ef5c946..e50e6bf 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -20,78 +20,37 @@
 <context><p>You can add as many complex types as you want to an XML schema.</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 complex type to
-an XML schema, follow these steps:</p></context>
+an XML schema, complete the following 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 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 <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">
-<alt>Browse icon</alt></image> to select a base type for your complex type.</cmd>
+<step><cmd>Select <uicontrol>Browse</uicontrol> in the <uicontrol>Inherited
+From</uicontrol> drop down 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>
+see <xref href="taddcmod.dita" scope="peer">Adding content models</xref>.</info>
+</step>
 <step><cmd>Select <uicontrol>restriction</uicontrol> or <uicontrol>extension</uicontrol> from
-the <uicontrol>Inherited by</uicontrol> list.</cmd><info>This specifies whether
+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 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>To add an attribute, in the Design view, right click your complex
-type and select <uicontrol>Add Attribute</uicontrol>.<ul>
+type. An attribute associates an attribute name with a specific type and value.
+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>
+</ul>For information about adding attributes, attribute references, and <userinput>any</userinput> attributes<?Pub Caret?>,
+see <xref href="taddagrp.dita" scope="peer">Adding attribute groups</xref>.</info>
 </step>
-<step><cmd>An attribute reference provides a reference to a global attribute.
-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. 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 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. 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 <uicontrol>namespace</uicontrol> 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.</info></step>
@@ -102,4 +61,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000006207?>
+<?Pub *0000003647?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
index 6204c40..350dee9 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding complex types" />
 <meta name="abstract" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
 <meta name="description" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
-<meta content="XML schema editor, adding, complex types, XML schema files, complex types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, complex types, XML schema files, complex types, XML schema files" name="keywords" />
+<meta content="XML schema editor, complex types, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, complex types, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddcmxt" name="DC.Identifier" />
@@ -37,7 +37,7 @@
 following instructions were written for the Resource perspective, but they
 will also work in many other perspectives.</p>
 <p>To add a complex type to
-an XML schema, follow these steps:</p>
+an XML schema, complete the following steps:</p>
 </div>
 
 <ol>
@@ -49,23 +49,24 @@
 <li class="stepexpand"><span>In the Properties view, type a new name for the complex type in
 the <span class="uicontrol">Name</span> field.</span></li>
 
-<li class="stepexpand"><span>Click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="Browse icon" /> to select a base type for your complex type.</span>
+<li class="stepexpand"><span>Select <span class="uicontrol">Browse</span> in the <span class="uicontrol">Inherited
+From</span> drop down to select a base type for your complex type.</span>
  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.</li>
+see <a href="taddcmod.html">Adding content models</a>.
+</li>
 
 <li class="stepexpand"><span>Select <span class="uicontrol">restriction</span> or <span class="uicontrol">extension</span> from
-the <span class="uicontrol">Inherited by</span> list.</span> This specifies whether
+the <span class="uicontrol">Inherited By</span> list.</span> This specifies whether
 your type is derived from its base type by restriction or extension.
 </li>
 
 <li class="stepexpand"><span>The Design view will display the attributes within the complex
 type.</span> 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.
-<ul>
-<li>To add an attribute, in the Design view, right click your complex
-type and select <span class="uicontrol">Add Attribute</span>.<ul>
+To add an attribute, in the Design view, right click your complex type and
+select <span class="uicontrol">Add Attribute</span>.<ul>
 <li><span class="uicontrol">name</span>. In the Design view, click the name of the
 attribute to make a change.</li>
 
@@ -74,68 +75,10 @@
 For more options, simply select <span class="uicontrol">Browse</span> from the menu.</li>
 
 </ul>
+For information about adding attributes, attribute references, and <kbd class="userinput">any</kbd> attributes,
+see <a href="taddagrp.html">Adding attribute groups</a>.
 </li>
 
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, in the Design view, right-click the complex
-type containing the element, and click <span class="uicontrol">Add Attribute Ref</span>.</span>
- A declaration that references a global attribute enables the referenced
-attribute to appear in the instance document 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<span class="uicontrol"> Ref</span> menu.
-</li>
-
-<li class="stepexpand"><span>An attribute group reference provides a reference to an attribute
-group. To add an attribute group reference, in the Design view, right-click
-the complex type containing the element, and click <span class="uicontrol">Add Attribute
-Group Ref</span>.</span> 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. Select the reference, then
-select the attribute group you want it to reference in the Properties view,
-from the<span class="uicontrol"> Ref</span> menu.</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
-to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
-enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the complex type header, and click <span class="uicontrol">Add Any Attribute</span>.</span>
- You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
-namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
-as it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
-
-</ul>
-</li>
-
-</ul>
-
- </li>
-
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
 to provide any information about this complex type.</span> The <span class="uicontrol">Documentation</span> page
 is used for human readable material, such as a description.</li>
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 57eeb53..6a5384a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
@@ -13,16 +13,17 @@
 and control the substitution of elements.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>elements</indexterm></indexterm>
-<indexterm>XML schema files<indexterm>elements</indexterm></indexterm>
-</keywords>
+<indexterm>XML schema files<indexterm>elements</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
 <context><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p><p>To add an element:</p></context>
+but they will also work in many other perspectives.</p><p>To add an element,
+complete the following steps:</p></context>
 <steps>
 <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>
+model (sequence, choice, or all element) 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>In the Design view, select the element, and click the current
 (default) name of the element, which puts you in direct editing mode, then
@@ -32,26 +33,26 @@
 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
 the list by selecting one of the following options:<ul>
-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available in
+<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
+<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available
 in the project that contains your file.</li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
+<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of the types
 available in your current file.</li>
-<li><uicontrol>Working Sets</uicontrol>. List all the types available within
+<li><uicontrol>Working Sets</uicontrol>: list all the types available within
 the selected working set.</li>
 </ul></info></substep>
 </substeps>
 </step>
 <step><cmd>(Optional) In the Properties view, select the appropriate value
-in the <uicontrol>MinOccurs</uicontrol> field.</cmd><info>This is the 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. Select <uicontrol>unbounded</uicontrol> to indicate there is no
-maximum number of occurrences.</info></step>
+in the <uicontrol>Minimum Occurrence</uicontrol> field.</cmd><info>This is
+the 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>Maximum
+Occurre<?Pub Caret?>nce</uicontrol> field.</cmd><info>This is the maximum
+number of times the element can appear in an instance 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.</info></step>
@@ -65,3 +66,4 @@
 about working with content models, refer to the related tasks.</postreq>
 </taskbody>
 </task>
+<?Pub *0000003885?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
index a9b3cb7..e32c564 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding elements" />
 <meta name="abstract" content="Elements are fundamental building blocks in XML. Element declarations 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." />
 <meta name="description" content="Elements are fundamental building blocks in XML. Element declarations 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." />
-<meta content="XML schema editor, adding, elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, elements, XML schema files" name="keywords" />
+<meta content="XML schema editor, elements, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, elements, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
@@ -38,13 +38,15 @@
 
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
-<p>To add an element:</p>
+<p>To add an element,
+complete the following steps:</p>
 </div>
 
 <ol>
 <li class="stepexpand"><span>To add an element, in the Design view, right-click the content
-model you want to work with and click <span class="uicontrol">Add Element</span>.</span>
- The element appears attached to the content model in the Design view.
+model (sequence, choice, or all element) you want to work with and click <span class="uicontrol">Add
+Element</span>.</span> The element appears attached to the content
+model in the Design view.
 <ol type="a">
 <li class="substepexpand"><span>In the Design view, select the element, and click the current
 (default) name of the element, which puts you in direct editing mode, then
@@ -55,16 +57,16 @@
 the Set Type dialog for more options.</span> The Set Type dialog lists
 all built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
 the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
+<li><span class="uicontrol">Workspace</span>: lists all of the types available in
 your workspace.</li>
 
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
+<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
 in the project that contains your file.</li>
 
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
+<li>(Default) <span class="uicontrol">Current Resource</span>: list all of the types
 available in your current file.</li>
 
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
+<li><span class="uicontrol">Working Sets</span>: list all the types available within
 the selected working set.</li>
 
 </ul>
@@ -75,15 +77,15 @@
 </li>
 
 <li class="stepexpand"><span>(Optional) In the Properties view, select the appropriate value
-in the <span class="uicontrol">MinOccurs</span> field.</span> This is the number
-of times the element can appear in an instance document. If you want the element
-to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
-</li>
+in the <span class="uicontrol">Minimum Occurrence</span> field.</span> This is
+the number of times the element can appear in an instance document. If you
+want the element to be optional, select <span class="uicontrol">0</span>. Otherwise,
+select <span class="uicontrol">1</span>. </li>
 
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times the element can appear in an instance
-document. Select <span class="uicontrol">unbounded</span> to indicate there is no
-maximum number of occurrences.</li>
+<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Maximum
+Occurrence</span> field.</span> This is the maximum
+number of times the element can appear in an instance document. Select <span class="uicontrol">unbounded</span> to
+indicate there is no maximum number of occurrences.</li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
 to provide any information about this element.</span> The <span class="uicontrol">Documentation</span> page
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 0a41c6a..21c66d3 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -20,30 +20,31 @@
 <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:</p></context>
+reference, complete the following steps:</p></context>
 <steps>
-<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>In the Design view, right-click the content model (sequence, choice,
+or all element) 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. To specify values for an element
 reference:</cmd>
 <choices>
 <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 view.
-Select a type from the menu, or select <uicontrol>Browse</uicontrol> for more
-options.</choice>
+<choice>Click the element reference type in the Design 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>
-<info>This is the number of times the global element referenced 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 global element referenced can
-appear. You can select <uicontrol>unbounded</uicontrol> to indicate there
-is no maximum number of occurrences.</info></step>
+<step><cmd>(Optional) Select the appropriate value in the <uicontrol>Minimum
+Occurrence</uicontrol> field.</cmd><info>This is the number of times the global
+element referenced 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>Maximum
+Occurrence<?Pub Caret?></uicontrol> field.</cmd><info>This is the maximum
+number of times the global element referenced 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 element reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page
 is used for human readable material, such as a description.</info></step>
@@ -54,4 +55,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000003232?>
+<?Pub *0000003039?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
index 40177eb..ac1e966 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding element references" />
 <meta name="abstract" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
 <meta name="description" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, adding, element references, XML schema files, element references, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, element references, XML schema files, element references, XML schema files" name="keywords" />
+<meta content="XML schema editor, element references, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, element references, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddglem.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
@@ -39,14 +39,15 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To add an element
-reference:</p>
+reference, complete the following steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>In the Design view, right-click the content model you want to work
-with and click <span class="uicontrol">Add Element Ref</span>.</span> 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.</li>
+<li class="stepexpand"><span>In the Design view, right-click the content model (sequence, choice,
+or all element) you want to work with and click <span class="uicontrol">Add Element Ref</span>.</span>
+ 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.
+</li>
 
 <li class="stepexpand"><span>Select the element reference. To specify values for an element
 reference:</span>
@@ -54,23 +55,23 @@
 <li>Click the name of the element reference in the Design view. Enter
 the name of the element reference.</li>
 
-<li>Click the element reference type in the Design view.
-Select a type from the menu, or select <span class="uicontrol">Browse</span> for more
-options.</li>
+<li>Click the element reference type in the Design view. Select a type
+from the menu, or select <span class="uicontrol">Browse</span> for more options.</li>
 
 </ul>
 
 </li>
 
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MinOccurs</span> field.</span>
- This is the number of times the global element referenced can appear
-in an instance document. If you want the element to be optional, select <span class="uicontrol">0</span>.
-Otherwise, select <span class="uicontrol">1</span>. </li>
+<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Minimum
+Occurrence</span> field.</span> This is the number of times the global
+element referenced can appear in an instance document. If you want the element
+to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
+</li>
 
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">MaxOccurs</span> field.</span>
- This is the maximum number of times the global element referenced can
-appear. You can select <span class="uicontrol">unbounded</span> to indicate there
-is no maximum number of occurrences.</li>
+<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Maximum
+Occurrence</span> field.</span> This is the maximum
+number of times the global element referenced can appear. You can select <span class="uicontrol">unbounded</span> to
+indicate there is no maximum number of occurrences.</li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
 to provide any information about this element reference.</span> The <span class="uicontrol">Documentation</span> page
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 719033f..e3ad077 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -19,7 +19,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 add a global
-attribute:</p></context>
+attribute, complete the following steps:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Design view, right-click in the <b>Attributes</b> section
@@ -32,14 +32,14 @@
 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
+<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
+<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available
 in the project that contains your file. </li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
+<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of the types
 available in your current file.</li>
-<li><uicontrol>Working Sets</uicontrol>. List all the types available within
-the selected working set.</li>
+<li><uicontrol>Working Sets</uicontrol>: l<?Pub Caret?>ist all the types available
+within the selected working set.</li>
 </ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>
 </step>
 <step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want
@@ -52,4 +52,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000003230?>
+<?Pub *0000002983?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
index 29b0abf..91bb71c 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding global attributes" />
 <meta name="abstract" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
 <meta name="description" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
-<meta content="XML schema editor, adding, global attributes, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, global attributes, XML schema files" name="keywords" />
+<meta content="XML schema editor, global attributes, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, global attributes, XML schema files" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddglba" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -34,7 +34,7 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To add a global
-attribute:</p>
+attribute, complete the following steps:</p>
 </div>
 
 <ol>
@@ -53,17 +53,17 @@
 <div class="p">The Set Type dialog will appear, and lists
 all built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
 the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
+<li><span class="uicontrol">Workspace</span>: lists all of the types available in
 your workspace. </li>
 
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
+<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
 in the project that contains your file. </li>
 
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
+<li>(Default) <span class="uicontrol">Current Resource</span>: list all of the types
 available in your current file.</li>
 
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
+<li><span class="uicontrol">Working Sets</span>: list all the types available
+within the selected working set.</li>
 
 </ul>
 </div>
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 1dfe97d..90abd00 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -19,7 +19,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 add a global
-element:</p></context>
+element, complete the following steps:</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
@@ -36,122 +36,44 @@
 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
+<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
+<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available
 in the project that contains your file. </li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
+<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of the types
 available in your current file.</li>
-<li><uicontrol>Working Sets</uicontrol>. List all the types available within
+<li><uicontrol>Working Sets</uicontrol>: list all the types available within
 the selected working set.</li>
 </ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>
 </step>
-<step><cmd>(Optional) Click the <uicontrol>Other</uicontrol> tab.</cmd><info>In
-this page, you can specify the following various values for the global element: </info>
+<step><cmd>Click the <uicontrol>Advanced</uicontrol> tab.</cmd><info>In this
+page, you can specify the following various values for the global element: </info>
 <choices>
-<choice><uicontrol>abstract</uicontrol>. Click <b>true </b>if you want the
+<choice><uicontrol>Abstract</uicontrol>: click <b>true</b> if you want the
 global element to be abstract. When a global element is declared to be abstract,
 it cannot be used in an instance document. Instead, a member of that global
 element's substitution group must appear in the instance document.</choice>
-<choice><uicontrol>block</uicontrol>. This field determines whether the global
-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 <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 (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
+<choice><uicontrol>Block</uicontrol>: determines whether the global element
+may be replaced by an element derived from it.</choice>
+<choice><uicontrol>Final</uicontrol>: determines whether this global element
+may be derived from.</choice>
+<choice><uicontrol>Substitution Group</uicontrol>: a substitution group allows
 elements to be substituted for other elements.</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>
 </choices>
 </step>
-<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>
-<choices>
-<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 <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 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.
-To add an attribute reference, right-click in the Attributes page, 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. The menu option to add an attribute
-reference only appears if there are global attributes defined elsewhere in
-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. 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
-enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,
-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 <uicontrol>namespace</uicontrol> 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
+<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab 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.</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>
+<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab 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><?Pub Caret?>
 </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?>
+<?Pub *0000004383?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
index f38c0d5..20fd948 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding global elements" />
 <meta name="abstract" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
 <meta name="description" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
-<meta content="XML schema editor, adding, global elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, global elements, XML schema files" name="keywords" />
+<meta content="XML schema editor, global elements, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, global elements, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
 <meta content="XHTML" name="DC.Format" />
@@ -36,7 +36,7 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To add a global
-element:</p>
+element, complete the following steps:</p>
 </div>
 
 <ol>
@@ -60,16 +60,16 @@
 box appears, and lists all built-in and user-defined types currently available.
 You can change the <span class="uicontrol">Scope</span> of the list by selecting one
 of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
+<li><span class="uicontrol">Workspace</span>: lists all of the types available in
 your workspace. </li>
 
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
+<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
 in the project that contains your file. </li>
 
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
+<li>(Default) <span class="uicontrol">Current Resource</span>: list all of the types
 available in your current file.</li>
 
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
+<li><span class="uicontrol">Working Sets</span>: list all the types available within
 the selected working set.</li>
 
 </ul>
@@ -78,141 +78,38 @@
 
 </li>
 
-<li class="stepexpand"><span>(Optional) Click the <span class="uicontrol">Other</span> tab.</span> In
-this page, you can specify the following various values for the global element: 
+<li class="stepexpand"><span>Click the <span class="uicontrol">Advanced</span> tab.</span> In this
+page, you can specify the following various values for the global element: 
 <ul>
-<li><span class="uicontrol">abstract</span>. Click <strong>true </strong>if you want the
+<li><span class="uicontrol">Abstract</span>: click <strong>true</strong> if you want the
 global element to be abstract. When a global element is declared to be abstract,
 it cannot be used in an instance document. Instead, a member of that global
 element's substitution group must appear in the instance document.</li>
 
-<li><span class="uicontrol">block</span>. This field determines whether the global
-element may be replaced by an element derived from it.</li>
+<li><span class="uicontrol">Block</span>: determines whether the global element
+may be replaced by an element derived from it.</li>
 
-<li><span class="uicontrol">final</span>. This field determines whether this global
-element may be derived from.</li>
+<li><span class="uicontrol">Final</span>: determines whether this global element
+may be derived from.</li>
 
-<li><span class="uicontrol">fixed/default</span>. Click <span class="uicontrol">Browse</span> and
-select <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> and
-specify an appropriate value. If you select <strong>Fixed</strong>, the global element
-has a fixed value, which cannot be changed. If you select <strong>Default</strong>,
-the element has a default value.</li>
-
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-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.</li>
-
-<li><span class="uicontrol">nillable</span>. Select <strong>true</strong> if you do not
-want the global element to be able to have any child elements, only attributes. </li>
-
-<li><span class="uicontrol">substitutionGroup</span>. A substitution group allows
+<li><span class="uicontrol">Substitution Group</span>: a substitution group allows
 elements to be substituted for other elements.</li>
 
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Attributes</span> tab.</span> You
-can use this page to add attributes, attribute references, attributes group
-references, and <samp class="codeph">any</samp> attributes to your global element.
-</li>
-
-<li class="stepexpand"><span>An attribute associates an attribute name with a specific type
-and value. To add an attribute, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute</span>.</span> You can specify the following values for
-an attribute:
-<ul>
-<li><span class="uicontrol">fixed/default</span>. Click <span class="uicontrol">Browse</span> and
-select <span class="uicontrol">Fixed</span> or <span class="uicontrol">Default</span> and
-specify an appropriate value. If you select <strong>Fixed</strong>, the attribute has
-a fixed value, which cannot be changed. If you select <strong>Default</strong>, the
-attribute has a default value.</li>
-
-<li><span class="uicontrol">form</span>. Use this field to indicate if the appearance
-of this attribute in an instance of the XML schema must be qualified by a
-namespace.</li>
-
-<li><span class="uicontrol">name</span>. Enter the name of the attribute.</li>
-
-<li><span class="uicontrol">type</span>. Click <span class="uicontrol">Browse</span> and
-select the type of the attribute. </li>
-
-<li><span class="uicontrol">use</span>. This field indicates how an attribute
-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. <strong>Note</strong>:
-If you selected <span class="uicontrol">Default</span>, you must select <strong>optional</strong> in
-this field, otherwise the default value will not be valid.</li>
+<li><span class="uicontrol">Nillable</span>: select <strong>true</strong> if you do not
+want the global element to be able to have any child elements, only attributes. </li>
 
 </ul>
 
 </li>
 
-<li class="stepexpand"><span>An attribute reference provides a reference to a global attribute.
-To add an attribute reference, right-click in the Attributes page, and click <span class="uicontrol">Add
-Attribute Ref</span>.</span> A declaration that references a global
-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. Select the reference, then select the global attribute you want
-it to reference from the <span class="uicontrol">ref</span> list.</li>
-
-<li class="stepexpand"><span>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 <span class="uicontrol">Add Attribute Group Ref</span>.</span> 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. Select the
-reference, then select the attribute group you want it to reference from the <span class="uicontrol">ref</span> list.
-</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content according
-to namespaces, and the corresponding <samp class="codeph">any</samp> attribute element
-enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click in the Attributes page and click <span class="uicontrol">Add Any Attribute</span>.</span>
- You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">namespace</span> value, you can
-select:<ul>
-<li><strong>##any</strong>. This allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>. This allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>. This allows any well-formed XML that is not from the target
-namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>. This is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">processContents</span> value, you can select:<ul>
-<li><strong>skip</strong>. The XML processor will not validate the attribute content
-at all.</li>
-
-<li><strong>lax</strong>. The XML processor will validate the attribute content as much
-as it can.</li>
-
-<li><strong>strict</strong>. The XML processor will validate all the attribute content.</li>
-
-</ul>
-</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global element.</span> The <span class="uicontrol">Documentation</span> page
+<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab to provide any
+information about this global element.</span> The <span class="uicontrol">Documentation</span> page
 is used for human readable material, such as a description.</li>
 
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
+<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab to add application
+information elements to your annotations of schema components.</span> The <span class="uicontrol">Extensions</span> page
+allows you to specify the schema and add XML content to your annotations.
+</li>
 
 </ol>
 
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 3aa051e..6f0ec02 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -20,7 +20,7 @@
 <context>The menu option to add a group reference only appears if there are
 groups defined elsewhere in the document.<p>The following instructions were
 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>
+perspectives.</p><p>To add a group reference, complete the following steps<?Pub Caret?>:</p></context>
 <steps>
 <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>
@@ -29,8 +29,7 @@
 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.</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
@@ -38,4 +37,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000002277?>
+<?Pub *0000002007?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
index 130e49a..b0c642a 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding group references" />
 <meta name="abstract" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
 <meta name="description" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, adding, group references, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, group references, XML schema files" name="keywords" />
+<meta content="XML schema editor, group features, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, group features, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddgrup.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddgrpr" name="DC.Identifier" />
@@ -36,7 +36,7 @@
 groups defined elsewhere in the document.<p>The following instructions were
 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>
+<p>To add a group reference, complete the following steps:</p>
 </div>
 
 <ol>
@@ -50,8 +50,7 @@
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
 to provide any information about this group reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
+is used for human readable material, such as a description.</li>
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
 add application information elements to your annotations of schema components.</span>
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 5dce7f2..e79721b 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <task id="taddgrup" xml:lang="en-us">
@@ -12,13 +12,12 @@
 by the group, such as elements, element references, and group references.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema editor<indexterm>groups</indexterm></indexterm>
-<indexterm>XML schema files<indexterm>groups</indexterm></indexterm>
-</keywords>
+<indexterm>XML schema files<indexterm>groups</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
 <context><p></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 group, follow these steps:</p></context>
+perspective, but they ws<?Pub Caret?>ill also work in many other perspectives.</p><p>To
+add a group, complete the following steps:</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>Groups</b>, and click <uicontrol>Add
@@ -30,15 +29,14 @@
 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>
+<info>The <uicontrol>Extensions</uicontrol> 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
-group's content model is the representation of any data that can be contained
-inside the group. For more information about working with content models,
-refer to the related tasks.</info></step>
+and your new group.</cmd><info>Your group automatically contains a content
+model. A group's content model is the representation of any data that can
+be contained inside the group. For more information about working with content
+models, refer to the related tasks.</info></step>
 </steps>
 </taskbody>
 </task>
-<?Pub *0000002502?>
+<?Pub *0000002232?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
index b8141ed..02df3a5 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding groups" />
 <meta name="abstract" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
 <meta name="description" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
-<meta content="XML schema editor, adding, groups, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, groups, XML schema files" name="keywords" />
+<meta content="XML schema editor, groups, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, groups, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddgrpr.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
 <meta content="XHTML" name="DC.Format" />
@@ -35,9 +35,9 @@
 
 <div class="section"><p />
 <p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
+perspective, but they wsill also work in many other perspectives.</p>
 <p>To
-add a group, follow these steps:</p>
+add a group, complete the following steps:</p>
 </div>
 
 <ol>
@@ -55,16 +55,14 @@
 
 <li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
 add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to
-specify the schema and add XML content to your annotations.</li>
+ The <span class="uicontrol">Extensions</span> page allows you to specify the
+schema and add XML content to your annotations.</li>
 
 <li class="stepexpand"><span>In the Outline view, expand the <span class="uicontrol">Groups</span> folder
-and your new group.</span></li>
-
-<li class="stepexpand"><span>Your group automatically contains a content model. </span> A
-group's content model is the representation of any data that can be contained
-inside the group. For more information about working with content models,
-refer to the related tasks.</li>
+and your new group.</span> Your group automatically contains a content
+model. A group's content model is the representation of any data that can
+be contained inside the group. For more information about working with content
+models, refer to the related tasks.</li>
 
 </ol>
 
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 0188c47..ebe7557 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -20,20 +20,21 @@
 </metadata></prolog>
 <taskbody>
 <context><p>The imported schema can come from a different namespace than the
-current schema does.</p><p>You can add multiple import elements to an XML
-schema, however, prefixes and namespaces have to unique amongst the imported
-schemas.</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 import
-element, follow these steps:</p></context>
+current schema does. You can add multiple import elements to an XML schema,
+however, prefixes and namespaces have to unique amongst the imported schemas.</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 import element,
+complete the following steps:</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 Design view.</info></step>
+<step><cmd>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</cmd><info>The entire 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 <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>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:</cmd>
 <substeps>
 <substep><cmd>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </cmd>
@@ -67,10 +68,10 @@
 </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
-you can specify type information, any declarations from the included schema
+you can specify type information, any declarations from the included s<?Pub Caret?>chema
 will be available in the <uicontrol>Type</uicontrol> list for the element,
 attribute, complex or simple type.</p></result>
 <postreq></postreq>
 </taskbody>
 </task>
-<?Pub *0000004340?>
+<?Pub *0000004058?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
index d6946ec..a782053 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding import elements" />
 <meta name="abstract" content="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 an import element to bring in definitions and declarations from an imported schema into the current schema." />
 <meta name="description" content="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 an import element to bring in definitions and declarations from an imported schema into the current schema." />
-<meta content="XML schema editor, adding, import elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, import elements, XML schema files" name="keywords" />
+<meta content="XML schema editor, import elements, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, import elements, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
@@ -37,27 +37,26 @@
 schema. </p>
 
 <div class="section"><p>The imported schema can come from a different namespace than the
-current schema does.</p>
-<p>You can add multiple import elements to an XML
-schema, however, prefixes and namespaces have to unique amongst the imported
-schemas.</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 import
-element, follow these steps:</p>
+current schema does. You can add multiple import elements to an XML schema,
+however, prefixes and namespaces have to unique amongst the imported schemas.</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 import element,
+complete the following steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents should be displayed in the Design view.</li>
+<li class="stepexpand"><span>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</span> The entire schema and its contents should be
+displayed in the Design view.</li>
 
 <li class="stepexpand"><span>In the Design view, right click in the <strong>Directives</strong> section
 and click <span class="uicontrol">Add Import</span>.</span></li>
 
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span></li>
+<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click
+the <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> button to the right of the <span class="uicontrol">Schema
+location</span> field.</span></li>
 
 <li class="stepexpand"><span>If you want to import an XML schema located in the workbench:</span>
 <ol type="a">
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 bdc5924..e459542 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -11,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
-bring 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 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>include elements</indexterm></indexterm>
 <indexterm>XML schema files<indexterm>include elements</indexterm></indexterm>
@@ -22,28 +22,36 @@
 <taskbody>
 <context><p>The following instructions were written for the XML perspective,
 but they will also work in many other perspectives.</p><p>To add an include
-element, follow these steps:</p></context>
+element, complete the following steps:</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 are displayed in the Design view.</info></step>
+<step><cmd>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</cmd><info>The entire 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 <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><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 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 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.
+<step><cmd>If you want to import an XML schema located on the Web:</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
-from the URL you specify.</note></info></step>
+from the URL you specify.</note></info></substep>
+</substeps>
+</step>
 <step><cmd>The XML schema editor will retrieve the location of the included
 XML schema file, and display it in the <uicontrol>Schema location</uicontrol> field.
 This field can be edited at any time to reflect the location of the XML schema
@@ -69,9 +77,9 @@
 &lt;/complexType>
 </codeblock>and you have an XML schema called PurchaseOrder.xsd that has added
 an include for Address.xsd, then when defining a new element in  PurchaseOrder,
-you can select Address as its type.  <p>(c) Copyright 2001, World Wide Web
-Consortium (Massachusetts Institute of Technology, Institut National de Recherche
-en Informatique et en Automatique, Keio University).</p></result>
+you can select Address as its type.  <draft-comment>(c) Copyright 2001, World
+Wide Web Consortium (Massachusetts Institute of Technology, Institut National
+de Recherche en Informatique et en Automatique, Keio University).</draft-comment></result>
 </taskbody>
-</task>
-<?Pub *0000004728?>
+</task><?Pub Caret?>
+<?Pub *0000004595?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
index 7abba83..0347962 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding include elements" />
 <meta name="abstract" content="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 include element to bring 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." />
 <meta name="description" content="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 include element to bring 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." />
-<meta content="XML schema editor, adding, include elements, XML schema files, include elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, include elements, XML schema files, include elements, XML schema files" name="keywords" />
+<meta content="XML schema editor, include elements, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, include elements, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
@@ -33,45 +33,56 @@
 <div><p>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 <samp class="codeph">include</samp> element to
-bring 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. </p>
+bring 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. </p>
 
 <div class="section"><p>The following instructions were written for the XML perspective,
 but they will also work in many other perspectives.</p>
 <p>To add an include
-element, follow these steps:</p>
+element, complete the following steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
+<li class="stepexpand"><span>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</span> The entire schema and its contents are displayed
+in the Design view.</li>
 
 <li class="stepexpand"><span>In the Design view, right-click in the <strong>Directives</strong> section
 and click <span class="uicontrol">Add Include</span>.</span></li>
 
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span> The
-XML schema file you select must have the same namespace as the current schema.
+<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click
+the <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> button to the right of the <span class="uicontrol">Schema
+location</span> field.</span> The XML schema file you select must
+have the same namespace as the current schema.</li>
+
+<li class="stepexpand"><span>If you want to import an XML schema located in the workbench:</span>
+<ol type="a">
+<li><span>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </span>
 </li>
 
-<li class="stepexpand"><span>If you want to select an XML schema located in the workbench, select <span class="uicontrol">Workbench
-projects</span> and click <span class="uicontrol">Next</span>. </span></li>
-
-<li class="stepexpand"><span>Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span>
+<li><span>Select the schema you want to import and click <span class="uicontrol">Finish</span>.</span>
 </li>
 
-<li class="stepexpand"><span>If you want to select an XML schema located on the Web, select <span class="uicontrol">HTTP</span> and
-click <span class="uicontrol">Next</span>.</span></li>
+</ol>
 
-<li class="stepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
- <div class="note"><span class="notetitle">Note:</span>  A local copy of the schema will not be stored in the workbench.
+</li>
+
+<li class="stepexpand"><span>If you want to import an XML schema located on the Web:</span>
+<ol type="a">
+<li class="substepexpand"><span>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</span>
+</li>
+
+<li class="substepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
+ <div class="note"><span class="notetitle">Note:</span> 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.</div>
 </li>
 
+</ol>
+
+</li>
+
 <li class="stepexpand"><span>The XML schema editor will retrieve the location of the included
 XML schema file, and display it in the <span class="uicontrol">Schema location</span> field.
 This field can be edited at any time to reflect the location of the XML schema
@@ -104,10 +115,7 @@
 </pre>
 and you have an XML schema called PurchaseOrder.xsd that has added
 an include for Address.xsd, then when defining a new element in  PurchaseOrder,
-you can select Address as its type.  <p>(c) Copyright 2001, World Wide Web
-Consortium (Massachusetts Institute of Technology, Institut National de Recherche
-en Informatique et en Automatique, Keio University).</p>
-</div>
+you can select Address as its type.  </div>
 
 </div>
 
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 78fc383..6dd8175 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -22,28 +22,36 @@
 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:</p></context>
+add a redefine element, complete the following steps:</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 are displayed in the Design view.</info></step>
+<step><cmd>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</cmd><info>The entire 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 <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 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><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 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 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.
+<step><cmd>If you want to import an XML schema located on the Web:</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
-from the URL you specify.</note></info></step>
+from the URL you specify.</note></info></substep>
+</substeps>
+</step><?Pub Caret?>
 <step><cmd>The XML schema editor will retrieve the location of the included
 XML schema file, and display it in the <uicontrol>Schema location</uicontrol> field.
 This field can be edited at any time to reflect the location of the XML schema
@@ -61,4 +69,4 @@
 in the XML schema you selected in the redefine element. </p></result>
 </taskbody>
 </task>
-<?Pub *0000004055?>
+<?Pub *0000003931?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
index d7820c8..aaf6c67 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding redefine elements" />
 <meta name="abstract" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
 <meta name="description" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
-<meta content="XML schema editor, adding, redefine elements, XML schema files, redefine elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, redefine elements, XML schema files, redefine elements, XML schema files" name="keywords" />
+<meta content="XML schema editor, adding redefine elements, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, adding redefine elements, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
@@ -41,38 +41,49 @@
 <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:</p>
+add a redefine element, complete the following steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
+<li class="stepexpand"><span>Open your XML schema in the XML schema editor. In the Outline view,
+select your schema.</span> The entire schema and its contents are displayed
+in the Design view.</li>
 
 <li class="stepexpand"><span>In the Design view, right-click in the <strong>Directives</strong> section
 and click <span class="uicontrol">Add Redefine</span>.</span></li>
 
-<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> to
-the right of the <span class="uicontrol">Schema location</span> field.</span>
- The XML schema file you select must have the same namespace as the current
-schema.</li>
+<li class="stepexpand"><span>In the Properties view, click the <strong>General</strong> tab and click
+the <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> button to the right of the <span class="uicontrol">Schema
+location</span> field.</span> The XML schema file you select must
+have the same namespace as the current schema.</li>
 
-<li class="stepexpand"><span>If you want to select an XML schema located in the workbench, select <span class="uicontrol">Workbench
-projects</span> and click <span class="uicontrol">Next.</span></span></li>
-
-<li class="stepexpand"><span>Select the schema you want to include and click <span class="uicontrol">Finish</span>.</span>
+<li class="stepexpand"><span>If you want to import an XML schema located in the workbench:</span>
+<ol type="a">
+<li><span>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </span>
 </li>
 
-<li class="stepexpand"><span>If you want to select an XML schema located on the Web, select <span class="uicontrol">HTTP</span> and
-click <span class="uicontrol">Next</span>.</span></li>
+<li><span>Select the schema you want to import and click <span class="uicontrol">Finish</span>.</span>
+</li>
 
-<li class="stepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
-  <div class="note"><span class="notetitle">Note:</span> A local copy of the schema will not be stored in the workbench.
+</ol>
+
+</li>
+
+<li class="stepexpand"><span>If you want to import an XML schema located on the Web:</span>
+<ol type="a">
+<li class="substepexpand"><span>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</span>
+</li>
+
+<li class="substepexpand"><span>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.</span>
+ <div class="note"><span class="notetitle">Note:</span> 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.</div>
 </li>
 
+</ol>
+
+</li>
+
 <li class="stepexpand"><span>The XML schema editor will retrieve the location of the included
 XML schema file, and display it in the <span class="uicontrol">Schema location</span> field.
 This field can be edited at any time to reflect the location of the XML schema
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 3122220..df9d7b1 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <task id="taddreg" xml:lang="en-us">
@@ -18,7 +18,7 @@
 <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:</p></context>
+add a pattern to a simple type, complete the following steps:</p></context>
 <steps>
 <step><cmd>In the Design view, select the simple type you want to work with.</cmd>
 </step>
@@ -45,8 +45,8 @@
 </step>
 <step><cmd>When you are finished, click <uicontrol>Next</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>T<?Pub Caret1?>o 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>.
@@ -55,4 +55,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000002952?>
+<?Pub *0000002703?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
index 2a0c07a..462e5eb 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding pattern facets to simple types" />
 <meta name="abstract" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
 <meta name="description" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
-<meta content="XML schema editor, adding, pattern facets, XML schema files, pattern facets, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, pattern facets, XML schema files, pattern facets, XML schema files" name="keywords" />
+<meta content="XML schema editor, pattern facets, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, pattern facets, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddsmpt.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddreg" name="DC.Identifier" />
@@ -35,7 +35,7 @@
 <div class="section"><p> The value of the pattern is called a regular expression. You
 can specify it using the <span class="uicontrol">Regular Expression</span> wizard.</p>
 <p>To
-add a pattern to a simple type:</p>
+add a pattern to a simple type, complete the following steps:</p>
 </div>
 
 <ol>
@@ -76,8 +76,8 @@
 <li class="stepexpand"><span>When you are finished, click <span class="uicontrol">Next</span>.</span>
 </li>
 
-<li class="stepexpand"><span>(Optional) To test against the regular expression and see if a
-match occurs, enter sample text.</span></li>
+<li class="stepexpand"><span>To test against the regular expression and see if
+a match occurs, enter sample text.</span></li>
 
 <li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span>  The regular
 expression will appear in the Patterns page. <div class="tip"><span class="tiptitle">Tip:</span>  To edit an
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 189a8ac..437c1b9 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -8,9 +8,9 @@
 <titlealts>
 <searchtitle>Adding simple types</searchtitle>
 </titlealts>
-<shortdesc>Simple types are used to create 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>
+<shortdesc>Simple types are used to create 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>simple types</indexterm></indexterm>
 <indexterm>XML schema files<indexterm>simple types</indexterm></indexterm>
@@ -21,7 +21,7 @@
 Elements that contain numbers (and strings, and dates, and so on) but do not
 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>
+other perspectives.</p><p>To add a simple type, complete the following steps:</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
@@ -33,49 +33,34 @@
 </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
-built into the XML schema language.</choice>
-<choice><uicontrol>list</uicontrol>. List types are comprised of sequences
+<choice><uicontrol>atomic</uicontrol>: atomic types are<?Pub Caret?> all the
+simple types built into the XML schema language.</choice>
+<choice><uicontrol>list</uicontrol>: list types are comprised of sequences
 of atomic types. They have values that are comprised of finite-length sequences
 of atomic values. </choice>
-<choice><uicontrol>union</uicontrol>. A union type enables an element or attribute
+<choice><uicontrol>union</uicontrol>: union types enable an element or attribute
 value to be one or more instances of one type drawn from the union of multiple
 atomic and list types.</choice>
 </choices>
 </step>
-<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
+<step><cmd>If you selected <uicontrol>atomic</uicontrol> or <uicontrol>list</uicontrol> from
+the <uicontrol>Variety</uicontrol> drop-down, 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> or <uicontrol>Item 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
+<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
+<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available
 in the project that contains your file. </li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
+<li>(Default) <uicontrol>Current Resource</uicontrol>: lists all of the types
 available in your current file.</li>
-<li><uicontrol>Working Sets</uicontrol>. List all the types available within
+<li><uicontrol>Working Sets</uicontrol>: lists 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> 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
-in the project that contains your file. </li>
-<li>(Default) <uicontrol>Current Resource</uicontrol>. List all of the types
-available in your current file.</li>
-<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> list,
+<step><cmd>If you selected <uicontrol>union</uicontrol> from the <uicontrol>Variety</uicontrol> drop-down,
 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
@@ -92,9 +77,8 @@
 <li>To add one enumeration at a time, under <uicontrol>Specific constraint
 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 <uicontrol>Enumerations</uicontrol>.</li>
-<li>Click <uicontrol>Add</uicontrol>.</li>
+<li>To add several enumerations at one time:<ol>
+<li>Select <uicontrol>Enumerations</uicontrol> and 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>
@@ -111,8 +95,7 @@
 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 <uicontrol>Patterns</uicontrol>.</li>
-<li>Click <uicontrol>Add</uicontrol>.</li>
+<li>Select <uicontrol>Patterns</uicontrol> and 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>
@@ -129,4 +112,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000007829?>
+<?Pub *0000006649?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
index f699167..7449eb0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Adding simple types" />
 <meta name="abstract" content="Simple types are used to create 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." />
 <meta name="description" content="Simple types are used to create 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." />
-<meta content="XML schema editor, adding, simple types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding, simple types, XML schema files" name="keywords" />
+<meta content="XML schema editor, simple types, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, simple types, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddreg.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddsmpt" name="DC.Identifier" />
@@ -28,9 +28,9 @@
 
 
 
-<div><p>Simple types are used to create 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.</p>
+<div><p>Simple types are used to create 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.</p>
 
 <div class="section"><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
@@ -38,7 +38,7 @@
 <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>
+<p>To add a simple type, complete the following steps:</p>
 </div>
 
 <ol>
@@ -57,14 +57,14 @@
 
 <li class="stepexpand"><span>You can select the following options from the <span class="uicontrol">Variety</span> list:</span>
 <ul>
-<li><span class="uicontrol">atomic</span>. Atomic types are all the simple types
-built into the XML schema language.</li>
+<li><span class="uicontrol">atomic</span>: atomic types are all the
+simple types built into the XML schema language.</li>
 
-<li><span class="uicontrol">list</span>. List types are comprised of sequences
+<li><span class="uicontrol">list</span>: list types are comprised of sequences
 of atomic types. They have values that are comprised of finite-length sequences
 of atomic values. </li>
 
-<li><span class="uicontrol">union</span>. A union type enables an element or attribute
+<li><span class="uicontrol">union</span>: union types enable an element or attribute
 value to be one or more instances of one type drawn from the union of multiple
 atomic and list types.</li>
 
@@ -72,49 +72,29 @@
 
 </li>
 
-<li class="stepexpand"><span>If you selected <span class="uicontrol">atomic</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Base type</span> field
+<li class="stepexpand"><span>If you selected <span class="uicontrol">atomic</span> or <span class="uicontrol">list</span> from
+the <span class="uicontrol">Variety</span> drop-down, click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> next
+to the <span class="uicontrol">Base type</span> or <span class="uicontrol">Item type</span> field
 to specify a base type for the simple type.</span> The Set Type dialog
 box lists all built-in and user-defined types currently available. You can
 change the <span class="uicontrol">Scope</span> of the list by selecting one of the
 following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
+<li><span class="uicontrol">Workspace</span>: lists all of the types available in
 your workspace. </li>
 
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
+<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
 in the project that contains your file. </li>
 
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
+<li>(Default) <span class="uicontrol">Current Resource</span>: lists all of the types
 available in your current file.</li>
 
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
+<li><span class="uicontrol">Working Sets</span>: lists all the types available within
 the selected working set.</li>
 
 </ul>
 </li>
 
-<li class="stepexpand"><span>If you selected <span class="uicontrol">list</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Item type</span> field
-to specify a item type for the simple type.</span> The Set Type dialog
-box lists all built-in and user-defined types currently available. You can
-change the <span class="uicontrol">Scope</span> of the list by selecting one of the
-following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>. List all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available within
-the selected working set.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">union</span> from the <span class="uicontrol">Variety</span> list,
+<li class="stepexpand"><span>If you selected <span class="uicontrol">union</span> from the <span class="uicontrol">Variety</span> drop-down,
 click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This&#10;graphic is the Browse button" /> next to the <span class="uicontrol">Member types</span> field
 to specify the member types for the simple type.</span> You can select
 to add both <span class="uicontrol">Built-in simple types</span> and <span class="uicontrol">User-defined
@@ -132,10 +112,8 @@
 values</span>, select <span class="uicontrol">Enumerations</span> and click <span class="uicontrol">Add</span> and
 specify a value for the enumeration.</li>
 
-<li>To add several enumerations at one time, follow these steps:<ol type="i">
-<li>Select <span class="uicontrol">Enumerations</span>.</li>
-
-<li>Click <span class="uicontrol">Add</span>.</li>
+<li>To add several enumerations at one time:<ol type="i">
+<li>Select <span class="uicontrol">Enumerations</span> and click <span class="uicontrol">Add</span>.</li>
 
 <li>Enter the value of each enumeration. Each value must be separated by the <span class="uicontrol">Delimiter
 character</span>. For example: <samp class="codeph">First, Second</samp> will create
@@ -160,9 +138,7 @@
 values.</span> 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 type="i">
-<li>Select <span class="uicontrol">Patterns</span>.</li>
-
-<li>Click <span class="uicontrol">Add</span>.</li>
+<li>Select <span class="uicontrol">Patterns</span> and click <span class="uicontrol">Add</span>.</li>
 
 <li>Create the regular expression pattern you wish to use as your constraint
 using the <span class="uicontrol">Regular Expression</span> wizard.</li>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
index bde45d1..50abd13 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="tcxmlsch" xml:lang="en-us">
 <title>Creating XML schemas</title>
 <titlealts>
@@ -14,12 +15,12 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context>To create an XML schema, follow these steps:</context>
+<context>To create an XML schema, complete the following steps<?Pub Caret?>:</context>
 <steps>
 <step><cmd>Create a project to contain the XML schema.</cmd></step>
-<step><cmd>In the workbench, select  <menucascade><uicontrol>File > New >
-Other > XML > XML Schema</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
+<step><cmd>In the workbench, click <menucascade><uicontrol>File > New > Other</uicontrol>
+</menucascade> and select <menucascade><uicontrol>XML > XML Schema</uicontrol>
+</menucascade>. Click <uicontrol>Next</uicontrol>.</cmd></step>
 <step><cmd>Select the project or folder that will contain the XML schema.
 In the </cmd><info><uicontrol>File name</uicontrol> field, type the name of
 the XML schema, for example <userinput>MyXMLSchema.xsd</userinput>. The name
@@ -29,3 +30,4 @@
 <result>The XML schema opens in the XML schema editor. </result>
 </taskbody>
 </task>
+<?Pub *0000001558?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
index 9aec932..855bcd0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -34,14 +34,14 @@
 editor. Using the XML schema editor, you can specify element names that indicates
 which elements are allowed in an XML file, and in which combinations.</p>
 
-<div class="section">To create an XML schema, follow these steps:</div>
+<div class="section">To create an XML schema, complete the following steps:</div>
 
 <ol>
 <li class="stepexpand"><span>Create a project to contain the XML schema.</span></li>
 
-<li class="stepexpand"><span>In the workbench, select  <span class="menucascade"><span class="uicontrol">File &gt; New &gt;
-Other &gt; XML &gt; XML Schema</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
+<li class="stepexpand"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File &gt; New &gt; Other</span>
+</span> and select <span class="menucascade"><span class="uicontrol">XML &gt; XML Schema</span>
+</span>. Click <span class="uicontrol">Next</span>.</span></li>
 
 <li class="stepexpand"><span>Select the project or folder that will contain the XML schema.
 In the </span> <span class="uicontrol">File name</span> field, type the name of
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
index 8c1475c..b13288c 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="tdelscmp" xml:lang="en-us">
 <title>Deleting XML schema components</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 delete an XML
-schema component, follow these steps:</p></context>
+schema component, complete the following steps:</p></context>
 <steps>
 <step><cmd>Open your XML schema in the XML schema editor.</cmd></step>
 <step><cmd>In the Outline view, click the item to delete.</cmd></step>
@@ -27,4 +28,5 @@
 integrity issues. When you delete certain components, cleanup will automatically
 occur.</p></result>
 </taskbody>
-</task>
+</task><?Pub Caret?>
+<?Pub *0000001384?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
index a4cc200..25981f2 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Deleting XML schema components" />
 <meta name="abstract" content="If you have created any XML schema components you no longer need, you can delete them." />
 <meta name="description" content="If you have created any XML schema components you no longer need, you can delete them." />
-<meta content="XML schema editor, deleting, components, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, deleting, components, XML schema files" name="keywords" />
+<meta content="XML schema editor, deleting components, XML schema files" name="DC.subject" />
+<meta content="XML schema editor, deleting components, XML schema files" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rrefintg.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tdelscmp" name="DC.Identifier" />
@@ -34,7 +34,7 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To delete an XML
-schema component, follow these steps:</p>
+schema component, complete the following steps:</p>
 </div>
 
 <ol>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
index 6276242..2c84134 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="tedtpref" xml:lang="en-us">
 <title>Editing XML schema file preferences</title>
 <titlealts>
@@ -14,16 +15,18 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context><p>To define XML schema file preferences, follow these steps:</p></context>
+<context><p>To define XML schema file preferences, complete the following
+steps:</p></context>
 <steps>
-<step><cmd>Select  <menucascade><uicontrol>Window > Preferences > Web and
-XML > XML Schema Files</uicontrol></menucascade>.</cmd></step>
+<step><cmd>Click <menucascade><uicontrol>Window > Preferences</uicontrol>
+</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML
+Schema Files</uicontrol></menucascade>.</cmd></step>
 <step><cmd>Select the <uicontrol>Qualify XML schema language constructs</uicontrol> check
 box if you want a prefix applied to all XML Schema language constructs in
 your XML schema.</cmd></step>
 <step><cmd>In the <uicontrol>XML schema language constructs prefix</uicontrol> field,
 type the prefix you want applied to XML Schema language constructs in your
-XML schema.</cmd><info> The prefix <uicontrol>xsd</uicontrol> is used by convention
+XML schema.</cmd><info>The prefix <uicontrol>xsd</uicontrol> is used by convention
 to denote the XML Schema namespace, but any prefix can be used. The purpose
 of the association is to identify the elements and simple types as belonging
 to the vocabulary of the XML Schema language rather than the vocabulary of
@@ -40,3 +43,4 @@
 <result></result>
 </taskbody>
 </task>
+<?Pub *0000002381?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
index fe76430..7128fbc 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Editing XML schema file preferences" />
 <meta name="abstract" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
 <meta name="description" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
-<meta content="XML schema files, defining, default target namespace, XML schema files, schema prefix" name="DC.subject" />
-<meta content="XML schema files, defining, default target namespace, XML schema files, schema prefix" name="keywords" />
+<meta content="XML schema files, editing preferences, preferences" name="DC.subject" />
+<meta content="XML schema files, editing preferences, preferences" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tedtpref" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -30,12 +30,14 @@
 <div><p>You can set various preferences for XML schema files such as the
 default target namespace and XML Schema language constructs prefix used.</p>
 
-<div class="section"><p>To define XML schema file preferences, follow these steps:</p>
+<div class="section"><p>To define XML schema file preferences, complete the following
+steps:</p>
 </div>
 
 <ol>
-<li class="stepexpand"><span>Select  <span class="menucascade"><span class="uicontrol">Window &gt; Preferences &gt; Web and
-XML &gt; XML Schema Files</span></span>.</span></li>
+<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window &gt; Preferences</span>
+</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
+Schema Files</span></span>.</span></li>
 
 <li class="stepexpand"><span>Select the <span class="uicontrol">Qualify XML schema language constructs</span> check
 box if you want a prefix applied to all XML Schema language constructs in
@@ -43,7 +45,7 @@
 
 <li class="stepexpand"><span>In the <span class="uicontrol">XML schema language constructs prefix</span> field,
 type the prefix you want applied to XML Schema language constructs in your
-XML schema.</span>  The prefix <span class="uicontrol">xsd</span> is used by convention
+XML schema.</span> The prefix <span class="uicontrol">xsd</span> is used by convention
 to denote the XML Schema namespace, but any prefix can be used. The purpose
 of the association is to identify the elements and simple types as belonging
 to the vocabulary of the XML Schema language rather than the vocabulary of
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 666ecb8..2e111e4 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <?Pub Inc?>
@@ -18,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 edit an XML schema's
-properties follow these steps:</p></context>
+properties, complete the following steps:</p></context>
 <steps>
 <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>
@@ -36,7 +36,7 @@
 </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.</info></step>
+is used for human readable material, such as a description.</info></step><?Pub Caret?>
 <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
@@ -44,4 +44,4 @@
 </steps>
 </taskbody>
 </task>
-<?Pub *0000002389?>
+<?Pub *0000002345?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
index 840ef3a..ba532b3 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Editing XML schema properties" />
 <meta name="abstract" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
 <meta name="description" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
-<meta content="XML schema editor, editing XML schemas, simple types, XML schema files, editing" name="DC.subject" />
-<meta content="XML schema editor, editing XML schemas, simple types, XML schema files, editing" name="keywords" />
+<meta content="XML schema editor, XML schema properties, XML schema files, editing properties" name="DC.subject" />
+<meta content="XML schema editor, XML schema properties, XML schema files, editing properties" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tedtschm" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -33,7 +33,7 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To edit an XML schema's
-properties follow these steps:</p>
+properties, complete the following steps:</p>
 </div>
 
 <ol>
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 bc1b82a..90014ec 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <task id="timpschm" xml:lang="en-us">
@@ -18,17 +18,35 @@
 <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:</p></context>
+schema into the workbench, complete the following steps:</p></context>
 <steps>
 <step><cmd>Click <menucascade><uicontrol>File > Import</uicontrol></menucascade>.</cmd>
 </step>
-<step><cmd>Select the import source.</cmd><info> Click <uicontrol>Next</uicontrol>.</info>
+<step><cmd>Select <menucascade><uicontrol>General</uicontrol><uicontrol>File
+System</uicontrol></menucascade> and click  <uicontrol>Next</uicontrol>.</cmd>
 </step>
-<step><cmd>Fill in the fields in the Import wizard as necessary.</cmd><info> When
-you are finished, click <uicontrol>Finish</uicontrol>.</info></step>
-</steps>
+<step><cmd>Click <uicontrol>Browse</uicontrol> on the next page of the wizard
+to select the directories from which you would like to add the XML schema.</cmd>
+</step>
+<step><cmd>In the import selection panes, use the following methods to select
+exactly the resources you want to add:  </cmd><info><ul>
+<li>Expand the hierarchies in the left pane and select or clear the checkboxes
+that represent the folders in the selected directory. Then in the right pane,
+select or clear check boxes for individual files.</li>
+<li>Click <uicontrol>Filter Types</uicontrol> to filter the current selection
+for files of a specific type.</li>
+<li>Click <uicontrol>Select All</uicontrol> to select all resources in the
+directory, then go through and deselect the ones that you do not want to add.</li>
+<li>Click <uicontrol>Deselect All</uicontrol> to deselect all resources in
+the directory, then go through and choose individual resources to add.</li>
+</ul></info></step>
+<step><cmd>In the <uicontrol>Into folder</uicontrol> field, specify the Workbench
+project or folder that will be the import destination.</cmd></step>
+<step><cmd>When you have finished specifying your import options, click <uicontrol>Finish.</uicontrol></cmd>
+</step>
+</steps><?Pub Caret1?>
 <result><p>The imported schema now appears in the Navigator view. Double-click
 it to open it in the XML schema editor.</p></result>
 </taskbody>
 </task>
-<?Pub *0000001448?>
+<?Pub *0000002616?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
index 8726a2c..dc50374 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -40,18 +40,44 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To import an XML
-schema into the workbench:</p>
+schema into the workbench, complete the following steps:</p>
 </div>
 
 <ol>
 <li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">File &gt; Import</span></span>.</span>
 </li>
 
-<li class="stepexpand"><span>Select the import source.</span>  Click <span class="uicontrol">Next</span>.
+<li class="stepexpand"><span>Select <span class="menucascade"><span class="uicontrol">General</span> &gt; <span class="uicontrol">File
+System</span></span> and click  <span class="uicontrol">Next</span>.</span>
 </li>
 
-<li class="stepexpand"><span>Fill in the fields in the Import wizard as necessary.</span>  When
-you are finished, click <span class="uicontrol">Finish</span>.</li>
+<li class="stepexpand"><span>Click <span class="uicontrol">Browse</span> on the next page of the wizard
+to select the directories from which you would like to add the XML schema.</span>
+</li>
+
+<li class="stepexpand"><span>In the import selection panes, use the following methods to select
+exactly the resources you want to add:  </span> <ul>
+<li>Expand the hierarchies in the left pane and select or clear the checkboxes
+that represent the folders in the selected directory. Then in the right pane,
+select or clear check boxes for individual files.</li>
+
+<li>Click <span class="uicontrol">Filter Types</span> to filter the current selection
+for files of a specific type.</li>
+
+<li>Click <span class="uicontrol">Select All</span> to select all resources in the
+directory, then go through and deselect the ones that you do not want to add.</li>
+
+<li>Click <span class="uicontrol">Deselect All</span> to deselect all resources in
+the directory, then go through and choose individual resources to add.</li>
+
+</ul>
+</li>
+
+<li class="stepexpand"><span>In the <span class="uicontrol">Into folder</span> field, specify the Workbench
+project or folder that will be the import destination.</span></li>
+
+<li class="stepexpand"><span>When you have finished specifying your import options, click <span class="uicontrol">Finish.</span></span>
+</li>
 
 </ol>
 
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
index c4f2a0f..60386d1 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
 <task id="tnavsrc" xml:lang="en-us">
 <title>Navigating XML schemas</title>
 <titlealts>
 <searchtitle>Navigating XML schemas</searchtitle>
 </titlealts>
 <shortdesc>When you are working in the Source view, you can use F3 to navigate
-through the file by placing your cursor in the appropriate item and clicking
+through the file by placing your cursor in the appropriate item and pressing
 F3 to jump to the item it refers to. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>XML schema files<indexterm>navigating</indexterm></indexterm>
@@ -22,11 +23,12 @@
 <li>Attribute group references</li>
 <li>Import, include, and redefine element (the external schema will open in
 the XML schema editor. This only works with schemas in the workspace).</li>
-</ul><p>You must place your cursor exactly in the location of the reference
-(for example between the double quotes for <systemoutput>type = " "</systemoutput> or
- <systemoutput>base = " "</systemoutput>).</p><p>For example, if you place
-your cursor anywhere in the following text and click F3:</p><p> <systemoutput>&lt;element
-name="shipTo" type="po:USAddress">&lt;/element></systemoutput> </p><p>the
+<li></li>
+</ul><p>You<?Pub Caret?> must place your cursor exactly in the location of
+the reference (for example between the double quotes for <systemoutput>type
+= " "</systemoutput> or  <systemoutput>base = " "</systemoutput>).</p><p>For
+example, if you place your cursor anywhere in the following text and press
+F3:</p><p> <systemoutput>&lt;element name="shipTo" type="po:USAddress">&lt;/element></systemoutput> </p><p>the
 cursor will automatically jump to the location in the file where the type
 USAddress is defined.</p><p>Or, if you place your cursor anywhere in the following
 text and click F3:</p><p> <systemoutput>&lt;element ref="po:ContactElement">&lt;/element></systemoutput> </p><p>the
@@ -36,3 +38,4 @@
 F3, you will automatically be taken to that file.</p></context>
 </taskbody>
 </task>
+<?Pub *0000002066?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
index 582def5..76f1fee 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
@@ -2,15 +2,15 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Navigating XML schemas" />
-<meta name="abstract" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to." />
-<meta name="description" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and clicking F3 to jump to the item it refers to." />
+<meta name="abstract" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to." />
+<meta name="description" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to." />
 <meta content="XML schema files, navigating" name="DC.subject" />
 <meta content="XML schema files, navigating" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
@@ -29,7 +29,7 @@
 
 
 <div><p>When you are working in the Source view, you can use F3 to navigate
-through the file by placing your cursor in the appropriate item and clicking
+through the file by placing your cursor in the appropriate item and pressing
 F3 to jump to the item it refers to. </p>
 
 <div class="section"><p>You can jump to any of the following items:</p>
@@ -47,14 +47,16 @@
 <li>Import, include, and redefine element (the external schema will open in
 the XML schema editor. This only works with schemas in the workspace).</li>
 
+<li />
+
 </ul>
-<p>You must place your cursor exactly in the location of the reference
-(for example between the double quotes for <tt class="sysout">type = " "</tt> or
- <tt class="sysout">base = " "</tt>).</p>
-<p>For example, if you place
-your cursor anywhere in the following text and click F3:</p>
-<p> <tt class="sysout">&lt;element
-name="shipTo" type="po:USAddress"&gt;&lt;/element&gt;</tt> </p>
+<p>You must place your cursor exactly in the location of
+the reference (for example between the double quotes for <tt class="sysout">type
+= " "</tt> or  <tt class="sysout">base = " "</tt>).</p>
+<p>For
+example, if you place your cursor anywhere in the following text and press
+F3:</p>
+<p> <tt class="sysout">&lt;element name="shipTo" type="po:USAddress"&gt;&lt;/element&gt;</tt> </p>
 <p>the
 cursor will automatically jump to the location in the file where the type
 USAddress is defined.</p>
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 eea3411..f0a54c0 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
 <task id="refactoring" xml:lang="en-us">
@@ -11,11 +11,10 @@
 single artifact change, and have that change implemented throughout all other
 dependant artifacts.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>dependent artifacts<indexterm>refactorting XML schema files</indexterm></indexterm>
-<indexterm>refactoring<indexterm>XML schema files</indexterm></indexterm>
-<indexterm>renaming<indexterm>XML schema files</indexterm></indexterm>
-<indexterm>XML schemas<indexterm>editing</indexterm></indexterm>
-</keywords>
+<keywords><indexterm>dependent artifacts<indexterm>refactorting XML schema
+files</indexterm></indexterm><indexterm>refactoring<indexterm>XML schema files</indexterm></indexterm>
+<indexterm>renaming<indexterm>XML schema files</indexterm></indexterm><indexterm>XML
+schemas<indexterm>editing</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
 <prereq></prereq>
@@ -32,15 +31,15 @@
 for that artifact</info>
 <substeps>
 <substep><cmd>Type in the new name of the artifact.</cmd></substep>
-<substep><cmd>(Optional) Click <b>Preview</b>.</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>.</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>
 </step>
 </steps>
 <result>The new name will be entered in the opened XSD source, as well as
-in all dependant artifacts</result>
+in all dependant artifacts.<?Pub Caret?></result>
 <example><b><u>Component References in XML Schema</u></b><simpletable>
 <sthead>
 <stentry>Global named components</stentry>
@@ -94,4 +93,4 @@
 <postreq></postreq>
 </taskbody>
 </task>
-<?Pub *0000003131?>
+<?Pub *0000003205?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
index ceb881d..442e591 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
 <meta name="DC.Title" content="Refactoring in XML Schema Files" />
 <meta name="abstract" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
 <meta name="description" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta content="XML schema files, XML schema editor, refactoring, renaming, editing XML schemas, dependant artifacts" name="DC.subject" />
-<meta content="XML schema files, XML schema editor, refactoring, renaming, editing XML schemas, dependant artifacts" name="keywords" />
+<meta content="dependent artifacts, refactorting XML schema files, refactoring, XML schema files, renaming, XML schemas, editing" name="DC.subject" />
+<meta content="dependent artifacts, refactorting XML schema files, refactoring, XML schema files, renaming, XML schemas, editing" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="refactoring" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -49,8 +49,8 @@
 <ol type="a">
 <li class="substepexpand"><span>Type in the new name of the artifact.</span></li>
 
-<li class="substepexpand"><span>(Optional) Click <strong>Preview</strong>.</span> A window
-will open indicating all of the changes which will take place due to the refactoring.
+<li class="substepexpand"><span>(Optional) Click <strong>Preview</strong>.</span> A window will open
+indicating all of the changes which will take place due to the refactoring.
 </li>
 
 <li class="substepexpand"><span>Click <span class="uicontrol">OK.</span></span></li>
@@ -62,24 +62,24 @@
 </ol>
 
 <div class="section">The new name will be entered in the opened XSD source, as well as
-in all dependant artifacts</div>
+in all dependant artifacts.</div>
 
 <div class="example"><strong><u>Component References in XML Schema</u></strong><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
 <tr>
-<th valign="bottom" align="left" id="N100EB">Global named components</th>
+<th valign="bottom" align="left" id="N100F5">Global named components</th>
 
-<th valign="bottom" align="left" id="N100F1">Reference</th>
+<th valign="bottom" align="left" id="N100FB">Reference</th>
 
 </tr>
 
 <tr>
-<td valign="top" headers="N100EB"><ul>
+<td valign="top" headers="N100F5"><ul>
 <li>&lt;element name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100F1"><ul>
+<td valign="top" headers="N100FB"><ul>
 <li>&lt;element ref="foo"&gt;</li>
 
 <li>&lt;element substitutionGroup="foo"</li>
@@ -90,13 +90,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100EB"><ul>
+<td valign="top" headers="N100F5"><ul>
 <li>&lt;simple/complexType name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100F1"><ul>
+<td valign="top" headers="N100FB"><ul>
 <li>&lt;element type="foo"&gt;</li>
 
 <li>&lt;attribute type="foo"&gt;</li>
@@ -111,13 +111,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100EB"><ul>
+<td valign="top" headers="N100F5"><ul>
 <li>&lt;attribute name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100F1"><ul>
+<td valign="top" headers="N100FB"><ul>
 <li>&lt;attribute ref="foo"&gt;</li>
 
 </ul>
@@ -126,13 +126,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100EB"><ul>
+<td valign="top" headers="N100F5"><ul>
 <li>&lt;attributeGroup name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100F1"><ul>
+<td valign="top" headers="N100FB"><ul>
 <li>&lt;attributeGroup ref="foo"&gt;</li>
 
 </ul>
@@ -141,13 +141,13 @@
 </tr>
 
 <tr>
-<td valign="top" headers="N100EB"><ul>
+<td valign="top" headers="N100F5"><ul>
 <li>&lt;group name="foo"&gt;</li>
 
 </ul>
 </td>
 
-<td valign="top" headers="N100F1"><ul>
+<td valign="top" headers="N100FB"><ul>
 <li>&lt;group ref="foo"&gt;</li>
 
 </ul>
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 580f90c..5b6b807 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
@@ -17,16 +17,19 @@
 <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:</p></context>
+schema, complete the following steps:</p></context>
 <steps>
 <step><cmd>Right-click your file in the Navigator view and click <uicontrol>Validate</uicontrol>.</cmd>
 </step>
 <step><cmd> If validation was not successful, you can refer to the Problems
-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> and specifying the maximum number of
-error messages allowed.</note></info></step>
+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 clicking <menucascade><uicontrol>Window</uicontrol>
+<uicontrol>Preferences</uicontrol></menucascade> and selecting <menucascade>
+<uicontrol>General</uicontrol><uicontrol>Markers</uicontrol></menucascade>.
+Select the <uicontrol>Use marker limits</uicontrol> check box and change the
+number in the <uicontrol>Limit visible items per group</uicontrol> field.</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
@@ -34,14 +37,15 @@
 Web site are used for validation.</p><p>Certain error messages contain a reference
 to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures
 document. Each constraint has a unique name that will be referenced in the
-error message. For example, if you receive an error message with this text:
- <systemoutput>ct-props-correct</systemoutput> and you searched in the Structure
-document for the text, you would find that it is for the section "Schema Component
-Constraint: Complex Type Definition Properties Correct". </p><p>You can set
-up a project's properties so that different types of project resources are
-automatically validated when you save them. From a project's pop-up menu select <uicontrol>Properties</uicontrol>,
-then select <uicontrol>Validation</uicontrol>. Any validators you can run
-against your project will be listed in the Validation page.</p></result>
+error message. For example, if you receive an error message with this text: <systemoutput>ct-props-correct</systemoutput> and
+you searched in the Structure document for the text, you would find that it
+is for the section "Schema Component Constraint: Complex Type Definition Properties
+Correct". </p><p>You can set up a project's properties so that different types
+of project resources are automatically validated when you save them (this
+is set for all resources <?Pub Caret?>by default). From a project's pop-up
+menu select <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.
+Any validators you can run against your project will be listed in the Validation
+page.</p></result>
 </taskbody>
 <related-links>
 <link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">
@@ -57,3 +61,4 @@
 </link>
 </related-links>
 </task>
+<?Pub *0000003403?>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
index f6ef002..1e0c8c7 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
@@ -2,8 +2,8 @@
 <html lang="en-us" xml:lang="en-us">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
 <meta content="public" name="security" />
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -38,7 +38,7 @@
 <div class="section"><p>The following instructions were written for the Resource perspective,
 but they will also work in many other perspectives.</p>
 <p>To validate an XML
-schema:</p>
+schema, complete the following steps:</p>
 </div>
 
 <ol>
@@ -46,11 +46,14 @@
 </li>
 
 <li class="stepexpand"><span> If validation was not successful, you can refer to the Problems
-view to see what problems were logged. </span>  <div class="note"><span class="notetitle">Note:</span> If you receive an
-error message indicating that the Problems view is full, you can increase
-the number of error messages allowed by selecting  <span class="menucascade"><span class="uicontrol">Properties
-&gt; Validation</span></span> and specifying the maximum number of
-error messages allowed.</div>
+view to see what problems were logged. </span>  <div class="note"><span class="notetitle">Note:</span>  If you receive
+an error message indicating that the Problems view is full, you can increase
+the number of error messages allowed by clicking <span class="menucascade"><span class="uicontrol">Window</span>
+ &gt; <span class="uicontrol">Preferences</span></span> and selecting <span class="menucascade">
+<span class="uicontrol">General</span> &gt; <span class="uicontrol">Markers</span></span>.
+Select the <span class="uicontrol">Use marker limits</span> check box and change the
+number in the <span class="uicontrol">Limit visible items per group</span> field.</div>
+
 </li>
 
 </ol>
@@ -62,15 +65,16 @@
 <p>Certain error messages contain a reference
 to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures
 document. Each constraint has a unique name that will be referenced in the
-error message. For example, if you receive an error message with this text:
- <tt class="sysout">ct-props-correct</tt> and you searched in the Structure
-document for the text, you would find that it is for the section "Schema Component
-Constraint: Complex Type Definition Properties Correct". </p>
-<p>You can set
-up a project's properties so that different types of project resources are
-automatically validated when you save them. From a project's pop-up menu select <span class="uicontrol">Properties</span>,
-then select <span class="uicontrol">Validation</span>. Any validators you can run
-against your project will be listed in the Validation page.</p>
+error message. For example, if you receive an error message with this text: <tt class="sysout">ct-props-correct</tt> and
+you searched in the Structure document for the text, you would find that it
+is for the section "Schema Component Constraint: Complex Type Definition Properties
+Correct". </p>
+<p>You can set up a project's properties so that different types
+of project resources are automatically validated when you save them (this
+is set for all resources by default). From a project's pop-up
+menu select <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
+Any validators you can run against your project will be listed in the Validation
+page.</p>
 </div>
 
 </div>