updates
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
index d294bbc..910255f 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
@@ -13,13 +13,6 @@
*******************************************************************************/ -->
<contexts>
-<context id="edtd0000">
-<description>The DTD source page editor lets you edit a document type definition. The editor provides text editing features such as syntax highlighting and unlimited undo and redo.
-</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"/>
-</context>
-
<context id="webx0020">
<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a document type definition (DTD) file.
The line delimiters are Ctrl-J (UNIX), Ctrl-M (Mac), or Ctrl-M Ctrl-J (Windows).
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
new file mode 100644
index 0000000..f9df076
--- /dev/null
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
@@ -0,0 +1,22 @@
+<?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="dtdsource_source_HelpId">
+<description>The DTD source page editor lets you edit a document type definition. The editor provides text editing features such as syntax highlighting and unlimited undo and redo.
+</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"/>
+</context>
+</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
index b453de0..784ca85 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
@@ -2,5 +2,6 @@
plugin.properties,\
about.html,\
EditorDtdContexts.xml,\
- META-INF/
+ META-INF/,\
+ EditorDtdContexts2.xml
src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
index e79eaa7..ef4bab7 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
@@ -18,6 +18,7 @@
<extension point="org.eclipse.help.contexts">
<contexts file="EditorDtdContexts.xml" plugin ="org.eclipse.wst.dtd.ui"/>
+ <contexts file="EditorDtdContexts2.xml" plugin ="org.eclipse.wst.dtd.core"/>
</extension>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
index 869d87f..8b8dc10 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
+++ b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
@@ -13,14 +13,6 @@
*******************************************************************************/ -->
<contexts>
-<context id="ehtm0000">
-<description>The HTML source page editor lets you edit a file that is coded in the Hypertext Markup Language or in XHTML. 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 HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-</context>
-
<context id="misc0170">
<description>Use this dialog to edit the Web content settings for a Web project. You can specify the default document type, CSS profile, and target device. The public ID and system ID are populated automatically. To restore the defaults, click <b>Restore Defaults</b>.
</description>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
new file mode 100644
index 0000000..b614187
--- /dev/null
+++ b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
@@ -0,0 +1,23 @@
+<?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="htmlsource_source_HelpId">
+<description>The HTML source page editor lets you edit a file that is coded in the Hypertext Markup Language or in XHTML. 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 HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
+</context>
+</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
index 2364fdd..6dcb86b 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.html.ui.infopop/build.properties
@@ -1,5 +1,6 @@
bin.includes = plugin.xml,\
about.html,\
EditorHtmlContexts.xml,\
- META-INF/
+ META-INF/,\
+ EditorHtmlContexts2.xml
src.includes = build.properties
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
index 1b4f872..feafd3f 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
@@ -18,6 +18,7 @@
<extension point="org.eclipse.help.contexts">
<contexts file="EditorHtmlContexts.xml" plugin ="org.eclipse.wst.html.ui"/>
+ <contexts file="EditorHtmlContexts2.xml" plugin ="org.eclipse.wst.html.core"/>
</extension>