diff --git a/docs/org.eclipse.jst.doc.isv/build.xml b/docs/org.eclipse.jst.doc.isv/build.xml
index 1dc52b2..c76dafe 100644
--- a/docs/org.eclipse.jst.doc.isv/build.xml
+++ b/docs/org.eclipse.jst.doc.isv/build.xml
@@ -52,7 +52,7 @@
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/org.eclipse.jst.doc.isv_1.0.0"/>
 		<copy todir="${destination.temp.folder}/org.eclipse.jst.doc.isv_1.0.0" failonerror="true">
-			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_JST.xml,topics_Reference.xml,META-INF/,reference/,book.css,html/,notices.html"/>
+			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_JST.xml,topics_Reference.xml,META-INF/,reference/,book.css,html/,notices.html,topics_ExtPoint_Reference.xml,javadoctoc.xml,schema.css"/>
 		</copy>
 	</target>
 
diff --git a/docs/org.eclipse.jst.doc.isv/plugin.xml b/docs/org.eclipse.jst.doc.isv/plugin.xml
index c359d2e..aceeb4f 100644
--- a/docs/org.eclipse.jst.doc.isv/plugin.xml
+++ b/docs/org.eclipse.jst.doc.isv/plugin.xml
@@ -30,5 +30,9 @@
 		<!--
 		<toc file="toc_JST.xml"/>
 		-->
+		<!-- The following toc is generated by the build. -->
+		<toc file="topics_ExtPoint_Reference.xml"/>
+		<!-- The following toc is generated by the build. -->
+		<toc file="javadoctoc.xml"/>
 	</extension>
 </plugin>
diff --git a/docs/org.eclipse.jst.doc.isv/toc.xml b/docs/org.eclipse.jst.doc.isv/toc.xml
index d0a016b..c5abf46 100644
--- a/docs/org.eclipse.jst.doc.isv/toc.xml
+++ b/docs/org.eclipse.jst.doc.isv/toc.xml
@@ -5,7 +5,7 @@
 <!-- ============================================================================= -->
 
 <toc label="J2EE Standard Tools Developer Guide">
-	<topic label="JST" href="html/plugin_descriptions_JST/jst.html">
+	<topic label="Programmer's Guide" href="html/plugin_descriptions_JST/jst.html">
 		<link toc="toc_JST.xml" />
 	</topic>
 	<topic label="Reference">
diff --git a/docs/org.eclipse.jst.doc.isv/toc_JST.xml b/docs/org.eclipse.jst.doc.isv/toc_JST.xml
index ff68fb0..3c57f0c 100644
--- a/docs/org.eclipse.jst.doc.isv/toc_JST.xml
+++ b/docs/org.eclipse.jst.doc.isv/toc_JST.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="WST" href="html/plugin_descriptions_wst/wst.html">
+<toc label="Programmer's Guide" href="html/plugin_descriptions_JST/jst.html">
 	<topic label="Assembly Tools"
 		href="html/plugin_descriptions_WST/assembly.html">
 		<topic label="org.eclipse.wst"
diff --git a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml b/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
index 52a532f..535b94d 100644
--- a/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
+++ b/docs/org.eclipse.jst.doc.isv/topics_Reference.xml
@@ -5,7 +5,12 @@
 <!-- ============================================================================= -->
 <toc label="Reference">
 	<topic label="API Reference" href="reference/api/overview-summary.html">
+		<!-- The javadoctoc.xml toc is generated by the build. -->
+		<link toc="javadoctoc.xml" />
 	</topic>
+	
 	<topic label="Extension Points Reference" href="reference/extension-points/index.html">
+	    <!-- The topics_ExtPoints-Reference.xml toc is generated by the build. -->
+		<link toc="topics_ExtPoint_Reference.xml" />
 	</topic>
 </toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/build.xml b/docs/org.eclipse.wst.doc.isv/build.xml
index 675edfb..413628c 100644
--- a/docs/org.eclipse.wst.doc.isv/build.xml
+++ b/docs/org.eclipse.wst.doc.isv/build.xml
@@ -52,7 +52,7 @@
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/org.eclipse.wst.doc.isv_1.0.0"/>
 		<copy todir="${destination.temp.folder}/org.eclipse.wst.doc.isv_1.0.0" failonerror="true">
-			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_WST.xml,topics_Reference.xml,META-INF/,html/,reference/,book.css,notices.html"/>
+			<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_WST.xml,topics_Reference.xml,META-INF/,html/,reference/,book.css,notices.html,topics_ExtPoint_Reference.xml,schema.css,javadoctoc.xml"/>
 		</copy>
 	</target>
 
diff --git a/docs/org.eclipse.wst.doc.isv/plugin.xml b/docs/org.eclipse.wst.doc.isv/plugin.xml
index ff0a702..ccc4b96 100644
--- a/docs/org.eclipse.wst.doc.isv/plugin.xml
+++ b/docs/org.eclipse.wst.doc.isv/plugin.xml
@@ -28,5 +28,9 @@
 	<extension point="org.eclipse.help.toc">
 		<toc file="topics_Reference.xml"/>
 		<toc file="toc_WST.xml"/>
+		<!-- The following toc is generated by the build. -->
+		<toc file="topics_ExtPoint_Reference.xml"/>
+		<!-- The following toc is generated by the build. -->
+		<toc file="javadoctoc.xml"/>
 	</extension>
 </plugin>
diff --git a/docs/org.eclipse.wst.doc.isv/toc.xml b/docs/org.eclipse.wst.doc.isv/toc.xml
index 983f964..5637197 100644
--- a/docs/org.eclipse.wst.doc.isv/toc.xml
+++ b/docs/org.eclipse.wst.doc.isv/toc.xml
@@ -3,12 +3,11 @@
 <!-- ============================================================================= -->
 <!-- Define the top level topics                                                   -->
 <!-- ============================================================================= -->
-
 <toc label="Web Standard Tools Developer Guide">
-<topic label="First Step: Checking Out"
-		href="html/check_out_tutorial.html" />
-	<topic label="Eclipse API Scanner" href="html/eclipse_scanner.html" />
-	<topic label="WST" href="html/plugin_descriptions_WST/wst.html">
+
+	<topic label="Programmer's Guide" href="html/plugin_descriptions_WST/wst.html">
+		<topic label="First Step: Checking Out" href="html/check_out_tutorial.html" />
+		<topic label="Eclipse API Scanner" href="html/eclipse_scanner.html" />
 		<link toc="toc_WST.xml" />
 	</topic>
 	<topic label="Reference">
diff --git a/docs/org.eclipse.wst.doc.isv/toc_WST.xml b/docs/org.eclipse.wst.doc.isv/toc_WST.xml
index ff68fb0..bc2b63f 100644
--- a/docs/org.eclipse.wst.doc.isv/toc_WST.xml
+++ b/docs/org.eclipse.wst.doc.isv/toc_WST.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="WST" href="html/plugin_descriptions_wst/wst.html">
+<toc label="Programmer's Guide" href="html/plugin_descriptions_wst/wst.html">
 	<topic label="Assembly Tools"
 		href="html/plugin_descriptions_WST/assembly.html">
+		<!-- 
 		<topic label="org.eclipse.wst"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.html" />
+		-->
 	</topic>
 	<topic label="Command/Common Tools"
 		href="html/plugin_descriptions_WST/common_command.html">
+		<!-- 
 		<topic label="org.eclipse.wst.command.env"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.command.env.html" />
 		<topic label="org.eclipse.wst.command.env.core"
@@ -45,30 +48,38 @@
 			href="html/plugin_descriptions_WST/org.eclipse.wst.common.ui.properties.html" />
 		<topic label="org.eclipse.wst.common.uriresolver"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.common.uriresolver.html" />
+		-->
 	</topic>
 	<topic label="Cascading Style Sheets (CSS) Tools"
 		href="html/plugin_descriptions_WST/css.html">
+		<!--
 		<topic label="org.eclipse.wst.css.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.css.core.html" />
 		<topic label="org.eclipse.wst.css.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.css.ui.html" />
+		-->
 	</topic>
 	<topic label="Document Type Definition (DTD) Tools"
 		href="html/plugin_descriptions_WST/dtd.html">
+		<!--
 		<topic label="org.eclipse.wst.dtd.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.dtd.core.html" />
 		<topic label="org.eclipse.wst.dtd.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.dtd.ui.html" />
+		-->
 	</topic>
 	<topic label="HTML Tools"
 		href="html/plugin_descriptions_WST/html.html">
+		<!-- 
 		<topic label="org.eclipse.wst.html.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.html.core.html" />
 		<topic label="org.eclipse.wst.html.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.html.ui.html" />
+		-->
 	</topic>
 	<topic label="Internet Tools"
 		href="html/plugin_descriptions_WST/internet.html">
+		<!--
 		<topic label="org.eclipse.wst.internet.cache"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.cache.html" />
 		<topic label="org.eclipse.wst.internet.monitor.core"
@@ -77,16 +88,20 @@
 			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.monitor.ui.html" />
 		<topic label="org.eclipse.wst.internet.proxy"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.internet.proxy.html" />
+		-->
 	</topic>
 	<topic label="Javascript Tools"
 		href="html/plugin_descriptions_WST/js.html">
+		<!--
 		<topic label="org.eclipse.wst.javascript.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.javascript.core.html" />
 		<topic label="org.eclipse.wst.javascript.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.javascript.ui.html" />
+		-->
 	</topic>
 	<topic label="Relational Database (RDB) Tools"
 		href="html/plugin_descriptions_WST/rdb.html">
+		<!--
 		<topic label="org.eclipse.wst.rdb.connection.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.connection.ui.html" />
 		<topic label="org.eclipse.wst.rdb.core"
@@ -143,39 +158,49 @@
 			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.sqleditor.html" />
 		<topic label="org.eclipse.wst.rdb.sqlscrapbook"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.rdb.sqlscrapbook.html" />
+		-->
 	</topic>
 	<topic label="Server Tools"
-		href="html/plugin_descriptions_wst/server.html">
+		href="html/plugin_descriptions_WST/server.html">
+		<!-- 
 		<topic label="org.eclipse.wst.server.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.server.core.html" />
 		<topic label="org.eclipse.wst.server.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.server.ui.html" />
 		<topic label="org.eclipse.wst.server.util"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.server.util.html" />
+		-->
 	</topic>
 	<topic label="Structured Source Editor (SSE) Tools"
 		href="html/plugin_descriptions_WST/sse.html">
+		<!--
 		<topic label="org.eclipse.wst.sse.core"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.sse.core.html" />
 		<topic label="org.eclipse.wst.sse.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.sse.ui.html" />
+		-->
 	</topic>
 	<topic label="Validation Tools"
 		href="html/plugin_descriptions_WST/validation.html">
+		<!-- 
 		<topic label="org.eclipse.wst.validation"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.validation.html" />
 		<topic label="org.eclipse.wst.validation.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.validation.ui.html" />
+		-->
 	</topic>
 	<topic label="Web Tools"
 		href="html/plugin_descriptions_WST/web.html">
+		<!-- 
 		<topic label="org.eclipse.wst.web"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.web.html" />
 		<topic label="org.eclipse.wst.web.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.web.ui.html" />
+		-->
 	</topic>
 	<topic label="Web Services (WS), WSDL and WS-I Tools"
 		href="html/plugin_descriptions_WST/ws.html">
+		<!--
 		<topic label="org.eclipse.wst.ws"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.ws.html" />
 		<topic label="org.eclipse.wst.ws.explorer"
@@ -194,9 +219,11 @@
 			href="html/plugin_descriptions_WST/org.eclipse.wst.wsi.html" />
 		<topic label="org.eclipse.wst.wsi.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.wsi.ui.html" />
+		-->
 	</topic>
 	<topic label="XML Tools &amp; XML Schema Definition (XSD) Tools"
 		href="html/plugin_descriptions_WST/xml.html">
+		<!-- 
 		<topic label="org.eclipse.wst.xml.catalog"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.xml.catalog.html" />
 		<topic label="org.eclipse.wst.xml.catalog.ui"
@@ -215,5 +242,6 @@
 			href="html/plugin_descriptions_WST/org.eclipse.wst.xsd.core.html" />
 		<topic label="org.eclipse.wst.xsd.ui"
 			href="html/plugin_descriptions_WST/org.eclipse.wst.xsd.ui.html" />
+		-->
 	</topic>
 </toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.isv/topics_Reference.xml b/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
index 52a532f..535b94d 100644
--- a/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
+++ b/docs/org.eclipse.wst.doc.isv/topics_Reference.xml
@@ -5,7 +5,12 @@
 <!-- ============================================================================= -->
 <toc label="Reference">
 	<topic label="API Reference" href="reference/api/overview-summary.html">
+		<!-- The javadoctoc.xml toc is generated by the build. -->
+		<link toc="javadoctoc.xml" />
 	</topic>
+	
 	<topic label="Extension Points Reference" href="reference/extension-points/index.html">
+	    <!-- The topics_ExtPoints-Reference.xml toc is generated by the build. -->
+		<link toc="topics_ExtPoint_Reference.xml" />
 	</topic>
 </toc>
\ No newline at end of file