diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
index 5c6c0fe..e5d03e0 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
+++ b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
@@ -11,118 +11,163 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
 <contexts>
+	<context id="csh_outer_container">
+		<description/>
+	</context>
+	<context id="webx0060">
+		<description>
+			This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file.
 
-<context id="webx0060">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file.
+			Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
 
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
+ 			<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
 
-The encoding attribute is used to specify the default character encoding set that is used when creating XML related files (DTDs, XML files, XML schemas).  Changing the encoding causes any new XML related files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclispe.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
+			The encoding attribute is used to specify the default character encoding set that is used when creating XML related files (DTDs, XML files, XML schemas). Changing the encoding causes any new, XML related files that are created from scratch to use the selected encoding.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html" label="Specifying XML default encoding and line delimiters"/>
+	</context>
+	<context id="webx0061">
+		<description>
+			This page lets you specify the formatting and content assist preferences that will be used when editing an XML file.
 
-<context id="webx0061">
-<description>This page lets you specify the formatting and content assist preferences that will be used when editing an XML file.
+			Enter a maximum width in the <b>Line width</b> field to specify when a line should be broken to fit onto more than one line. This will be applied when the document is formatted.
 
-Enter a maximum width in the <b>Line width</b> field to specify the line width to break a line to fit onto more than one line when the document is formatted.
+			Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted.
 
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted.
+			Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
 
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
+			Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
 
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
+			If you prefer to use spaces, select <b>Indent using spaces</b>.
 
-If you prefer to use spaces, select <b>Indent using spaces</b>.
+			You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
 
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
+			To apply these formatting styles, right-click in your XML document, and click <b>Format &gt; Document</b>.
 
-To apply these formatting styles, select the <b>Format Document</b> menu item.
+			If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
 
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
+			If you select <b>Strict</b> from the <b>Suggestion strategy</b> list, suggestions that are grammatically valid will be shown first (with bold icons) in the content assist list. Other suggestions that are applicable to the element scope, but not grammatically valid, will be shown below them with a de-emphasized icon. The default value for this field is <b>Lax</b>.
 
-If a DTD or Schema (or other model) is not specified for an XML file, selecting <b>Use inferred grammar in absence of DTD/Schema</b> allows the editor to "guess" what elements or attributes are available based on existing content.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
+			If a DTD or schema (or other model) is not specified for an XML file, selecting <b>Use inferred grammar in absence of DTD/Schema</b> allows the editor to "guess" what elements or attributes are available based on existing content.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html" label="Defining XML editor preferences"/>
+	</context>
+	<context id="webx0062">
+		<description>
+			This page lets you customize the syntax highlighting that the XML editor does when you are editing a file.
 
-<context id="webx0062">
-<description>This page lets you customize the syntax highlighting that the XML editor does when you are editing a file.
+			The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
 
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
+			The <b>Foreground</b> and <b>Background</b> buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
 
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
+			Click the <b>Restore Defaults</b> button to set the highlighting styles back to their default values. If you only want to reset the value for a particular content type, select it in the <b>Content type</b> field, the click the <b>Restore Default</b> button next to it.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html" label="Setting source highlighting styles"/>
+	</context>
+	<context id="webx0063">
+		<description>
+			This page lets you create new templates and edit existing ones that can be used when editing an XML file. A template is a chunk of predefined code that you can insert into a file.
 
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
+			Click <b>New</b> if you want to create a completely new template.
 
-<context id="webx0063">
-<description>
-This page lets you create new and edit existing templates that will be used when editing an XML file.
+			Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist.
 
-Click <b>New</b> if you want to create a completely new template. 
+			If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the <b>date</b> variable indicates the current date will be inserted.
 
-Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist. 
-If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the word_selection variable indicates the word that is selected at the beginning of template insertion, and the cursor variable determines where the cursor will be after the template is inserted in the document. 
+			You can edit, remove, import, or export a template by using the same Preferences page. If you have modified a default template, you can restore it to its default value. You can also restore a removed template if you have not exited from the workbench since it was removed.
 
-You can edit, remove, import, or export a template by using the same Preferences page. If you have modified a default template, you can restore it to its default value. You can also restore a removed template if you have not exited from the workbench since it was removed. 
-If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the Templates preferences page.
-</description>
-<topic label="Adding and removing XML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
+			If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the <b>Templates</b> preferences page.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html" label="Working with XML templates"/>
+	</context>
+	<context id="xmlm1200">
+		<description>
+			Cleanup options enable you to update a document so that it is well-formed and consistently formatted.
 
-<context id="xmlm1200">
-<description>Cleanup options enable you to update a document so that it is well-formed and consistently formatted.
+			The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
 
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-- <b>Compress empty element tags</b>: Compress element tags with no content to one tag with an end tag delimiter (ie: change &lt;tag&gt;&lt;/tag&gt; to &lt;tag /&gt;).
-- <b>Insert required attributes</b>: Inserts an missing attributes that are required by the tag to make the element or document well-formed.
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipe.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
+			- <b>Compress empty element tags</b>: Compress element tags with no content to one tag with an end tag delimiter (ie: change &lt;tag&gt;&lt;/tag&gt; to &lt;tag/&gt;).
 
-<context id="xcui0500">
-<!--Edit attribute dialog -->
-<description>Enter the name of the attribute in the <b>Name</b> field. Enter the value of the attribute in the <b>Value</b> field. Click <b>OK</b>. The attribute will be added to the file.</description>
-</context>
+			- <b>Insert required attributes</b>: Inserts any missing attributes that are required by the tag to make the element or document well-formed.
 
-<context id="xcui0010">
-<!--Edit DOCTYPE dialog -->
-<description>The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can use the <b>Public ID</b> field to create an association using an XML Catalog entry or the <b>System ID</b> field to create an association using a file in the workbench.</description>
-</context>
-<context id="xcui0030">
-<description>Public ID Text Edit</description>
-</context>
-<context id="xcui0040">
-<description>Public ID Browse Button</description>
-</context>
-<context id="xcui0020">
-<description>Root Element Name Text Edit</description>
-</context>
-<context id="xcui0050">
-<description>System ID Text Edit</description>
-</context>
-<context id="xcui0060">
-<description>System ID Browse Button</description>
-</context>
+			- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
 
-<context id="xcui0600">
-<!--Edit element dialog -->
-<description>Enter the name of the element in the <b>Element name </b>field. Click <b>OK</b>. The element will be added to the file.</description>
-</context>
+			- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
 
-<context id="xcui0300">
-<!--Edit processing instructions dialog -->
-<description>A processing instruction is a syntax in XML for passing instructions along to the application using an XML document. The <b>Target</b> field is used to identify the application the instructions belongs to. The <b>Data </b>field contains the instructions.</description>
-</context>
+			- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
 
+			- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html" label="Editing in the Source view"/>
+	</context>
+	<context id="xcui0500">
+		<description>
+			Enter the name of the attribute in the <b>Name</b> field, then enter the value of the attribute in the <b>Value</b> field. Click <b>OK</b>. The attribute will be added to the file.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+	</context>
+	<context id="xcui0010">
+		<description>
+			The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can use the <b>Public ID</b> field to create an association using an XML Catalog entry or the <b>System ID</b> field to create an association using a file in the workbench.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
+	</context>
+	<context id="xcui0020">
+		<description>
+			This should match the name of your XML file's root element.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
+	</context>
+	<context id="xcui0030">
+		<description>
+			The value in this field is the Public Identifier. It is used to associate the XML file (using an XML catalog entry) with a DTD file by providing a hint to the XML processor.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
+	</context>
+	<context id="xcui0050">
+		<description>
+			The value in this field is the DTD the XML file is associated with. You can change the DTD the file is associated with by editing this field. The XML processor will try to use the Public ID to locate the DTD, and if this fails, it will use the System ID to find it.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations"/>
+	</context>
+	<context id="xcui0600">
+		<description>
+			Enter the name of the element in the <b>Element name</b> field, then click <b>OK</b>. The element will be added to the file.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+	</context>
+	<context id="xcui0300">
+		<description>
+			A processing instruction is a syntax in XML for passing instructions along to the application using an XML document. The <b>Target</b> field is used to identify the application the instructions belongs to. The <b>Data</b> field contains the instructions.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html" label="Editing XML processing instructions"/>
+	</context>
+	<context id="xcui0100">
+		<description>
+			This is a read-only dialog. Select the entry you want to edit and click <b>Edit</b>.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information"/>
+	</context>
+	<context id="xcui0200">
+		<description>
+			The value in the <b>Namespace Name</b> field is the namespace the XML file belongs to.
+
+			All qualified elements and attributes in the XML file associated with the namespace will be prefixed with the <b>Prefix</b> value.
+
+			The <b>Location Hint</b> field contains the location of the XML schema the XML file is associated with. An XML Catalog ID or a URI can be specified in this field. You can search for the schema you want to use by clicking <b>Browse</b>. Once you select a file, the <b>Namespace Name</b> and <b>Prefix</b> fields will automatically be filled with the appropriate values from the schema (you must leave the fields blank for this to occur). <b>Note</b>: If you are creating an XML file from an XML schema, you cannot change the <b>Namespace Name</b> or <b>Location Hint</b> values.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information"/>
+	</context>
+	<context id="xcui0400">
+		<description>
+			An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a URI (which contains information about a DTD or XML schema's location). Select the catalog entry you want to associate your XML file with.
+		</description>
+	</context>
 </contexts>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
index 36fe470..f4eb1f6 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
+++ b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
@@ -11,11 +11,13 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
 <contexts>
-<context id="xml_source_HelpId">
-<description>The XML source page editor lets you edit a file that is coded in the Extensible Markup Language. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing XML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html"/>
-</context>
-</contexts>
+	<context id="csh_outer_container">
+		<description/>
+	</context>
+	<context id="xml_source_HelpId">
+		<description>
+			The XML source view lets you edit a file that is coded in the Extensible Markup Language. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html" label="Editing in the Source view"/>
+	</context>
+</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml b/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
new file mode 100644
index 0000000..e62c284
--- /dev/null
+++ b/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+ 
+<contexts>
+	<context id="csh_outer_container">
+		<description/>
+	</context>
+	<context id="xmlm3000">
+		<description>
+			The Design view of the XML editor represents your file simultaneously as a table and a tree, which helps make navigation and editing easier. Depending on the kind of file you are working with, content and attribute values can be edited directly in table cells, while pop-up menus on tree elements give alternatives that are valid for that location.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view"/>
+	</context>
+</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
new file mode 100644
index 0000000..8b60050
--- /dev/null
+++ b/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+
+<contexts>
+	<context id="csh_outer_container">
+		<description/>
+	</context>
+	<context id="xmlc0101">
+		<description>
+			Select the <b>Create XML file from a DTD file</b> radio button to create an XML file from a DTD file. The file will contain the selected root element, populated with any required elements and attributes.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+	</context>
+	<context id="xmlc0102">
+		<description>
+			Select the <b>Create XML file from an XML schema file</b> radio button to create an XML file from an XML schema. The file will contain the selected root element of the XML schema and any elements or attributes it contains.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0103">
+		<description>
+			Select the <b>Create XML file from scratch</b> radio button if you want to create an XML file not associated with any XML schema or DTD file.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html" label="Creating empty XML files"/>
+	</context>
+	<context id="xmlc0500">
+		<description>
+			Select the <b>Select file from workbench</b> radio button if you want to create your XML file from a DTD or XML schema that is in the workbench.
+
+			Select the <b>Select XML Catalog entry</b> radio button if you want to use a file listed in the XML Catalog to create your XML file.
+		</description>
+	</context>
+	<context id="xmlc0410">
+		<description>
+			The root element of an XML file is the element that contains all other elements in that file. All elements defined in the DTD or all global elements defined in the XML schema are included in this list.
+
+			<b>Note</b>: If you do not have any elements in your DTD or any global elements in your XML schema, you cannot create an XML file from it.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0441">
+		<description>
+			If you select this check box, both mandatory and optional attributes will be generated. If you do not select it, only mandatory attributes will be generated.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0442">
+		<description>
+			If you select this check box, both the mandatory and optional elements will be generated. If you do not select it, only mandatory elements will be generated.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0443">
+		<description>
+			If you select this check box, the first choice of a required choice will be generated in your XML file.
+
+			For example, if you have the following code in your source file:
+
+ 			<b>&lt;choice&gt; &lt;element name="a" type="string&gt; &lt;element name="b" type="integer&gt; &lt;/choice&gt;</b> 
+
+			and you select this check box, an element such as the following will be created in your XML file:
+
+ 			<b>&lt;a&gt;hello&lt;/a&gt;</b> 
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0444">
+		<description>
+			If you select this check box, any elements and attributes generated will be filled with sample data, such as <b>&lt;text&gt;EmptyText&lt;/text&gt;.</b> Otherwise, they will be empty - that is, <b>&lt;text&gt;&lt;/text&gt;.</b> 
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html" label="Generating XML files from XML schemas"/>
+	</context>
+	<context id="xmlc0210">
+		<description>
+			The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+	</context>
+	<context id="xmlc0220">
+		<description>
+			The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.
+		</description>
+		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html" label="Generating XML files from DTDs"/>
+	</context>
+</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
index c3804bf..9e10328 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
@@ -5,4 +5,3 @@
                plugin.properties,\
                plugin.xml,\
 src.includes = build.properties
-src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties b/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
index 1150e9f..f6bbcc0 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
+++ b/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
@@ -1 +1,3 @@
+# NLS_MESSAGEFORMAT_VAR
+
 pluginName = XML infopops
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
index 756d006..2287c84 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.1"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -15,6 +15,9 @@
 <extension point="org.eclipse.help.contexts">
        <contexts file="EditorXmlContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
        <contexts file="EditorXmlContexts2.xml" plugin ="org.eclipse.core.runtime"/>
+       <contexts file="TableTree.xml" plugin ="org.eclipse.wst.xml.ui"/>
+       <contexts file="XMLWizardContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
+
 </extension>