diff --git a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
index ebc3bf9..1dcc5d6 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
@@ -52,7 +52,7 @@
 			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
 			<property name="args.eclipse.provider" value="Eclipse.org" />
 			<property name="args.eclipse.version" value="3.6.0" />
-			<property name="args.input" location="org.eclipse.jst.server.ui.doc.user_build_toc.ditamap" /> 
+			<property name="args.input" location="jst_reltable.ditamap" /> 
 			<property name="clean.temp" value="true" />
 			<property name="dita.extname" value=".dita" />
 			<property name="dita.temp.dir" location="temp" />
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/index/_2.cfs b/docs/org.eclipse.jst.server.ui.doc.user/index/_2.cfs
index 651f3a4..e2bc152 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/index/_2.cfs
+++ b/docs/org.eclipse.jst.server.ui.doc.user/index/_2.cfs
Binary files differ
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_contributions b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_contributions
index b929d0f..1577eef 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.
-#Tue May 13 23:14:01 EDT 2008
-org.eclipse.jst.server.ui.doc.user=org.eclipse.jst.server.ui.doc.user\n1.0.400.qualifier
+#Wed May 12 17:17:58 EDT 2010
+org.eclipse.jst.server.ui.doc.user=org.eclipse.jst.server.ui.doc.user\n1.0.500.qualifier
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_dependencies b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_dependencies
index 2a56a8b..3582b51 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.
-#Tue May 13 23:14:01 EDT 2008
-lucene=1.9.1.v200803061811
-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en
+#Wed May 12 17:17:58 EDT 2010
+lucene=1.9.1.v20080530-1600
+analyzer=org.eclipse.help.base\#3.3.101.M20080728_34x?locale\=en
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_docs b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_docs
index 4b35747..2bdb96b 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.jst.server.ui.doc.user/index/indexed_docs
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.
-#Tue May 13 23:14:01 EDT 2008
+#Wed May 12 17:17:58 EDT 2010
 /org.eclipse.jst.server.ui.doc.user/topics/tomcat.html=0
 /org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html=0
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/index/segments b/docs/org.eclipse.jst.server.ui.doc.user/index/segments
index 3cc5dc9..dcc0c96 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/index/segments
+++ b/docs/org.eclipse.jst.server.ui.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.ditamap b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.ditamap
index 7c2a4dd..5f3aba9 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.ditamap
+++ b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.ditamap
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
-  "map.dtd">
-<?Pub Inc?>
-<map id="relationship">
+ "map.dtd">
+<map id="relationship" xml:lang="en-us">
 <reltable>
 <relheader>
 <relcolspec type="concept"></relcolspec>
@@ -13,14 +12,14 @@
 </relheader>
 <relrow>
 <relcell></relcell>
-<relcell collection-type="family"><?Pub Caret?>
-<topicref href="topics/tomcat.dita" navtitle="Creating a Tomcat server"></topicref>
-<topicref href="topics/twtomprf.dita" navtitle="Adding the Apache Tomcat runtimes">
+<relcell collection-type="family">
+<topicref href="topics/tomcat.dita" navtitle="Creating a Tomcat server">
 </topicref>
+<topicref href="topics/twtomprf.dita"
+navtitle="Adding the Apache Tomcat runtimes"></topicref>
 </relcell>
 <relcell></relcell>
 <relcell></relcell>
 </relrow>
 </reltable>
 </map>
-<?Pub *0000000725?>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
new file mode 100644
index 0000000..0f46c75
--- /dev/null
+++ b/docs/org.eclipse.jst.server.ui.doc.user/jst_reltable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc/>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
index a83cd8d..187ff35 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
@@ -14,7 +14,6 @@
 <plugin>
 
 <extension point="org.eclipse.help.toc">
-	<toc file="org.eclipse.jst.server.ui.doc.user_build_toc.xml" />
 	<toc file="tomcat_create.xml" />
 	<toc file="tomcat_pref.xml" /> 
        <index path="index/"/>    
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user.maplist b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user.maplist
index 23a8c60..602c806 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user.maplist
+++ b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user.maplist
@@ -1,11 +1,9 @@
 <maplist version="3.6.2">
   <nav>
-    <map file="org.eclipse.jst.server.ui.doc.user_build_toc.ditamap"/>
     <map file="tomcat_pref.ditamap"/>
     <map file="tomcat_create.ditamap"/>
   </nav>
   <link>
-    <map file="org.eclipse.jst.server.ui.doc.user_build_toc.ditamap"/>
     <map file="jst_reltable.ditamap"/>
   </link>
 </maplist>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap
deleted file mode 100644
index b63cb78..0000000
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="For building purposes" xml:lang="en-us">
-<topicref href="topics/tomcat.dita" navtitle="Creating a Tomcat server">
-</topicref>
-<topicref href="topics/twtomprf.dita"
-navtitle="Adding the Apache Tomcat runtimes"></topicref>
-</map>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.xml b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.xml
deleted file mode 100644
index 75645e3..0000000
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="For building purposes" topic="topics/tomcat.html">
-<topic label="Creating a Tomcat server" href="topics/tomcat.html"/>
-<topic label="Adding the Apache Tomcat runtimes" href="topics/twtomprf.html"/>
-</toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
index a83cd8d..187ff35 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
@@ -14,7 +14,6 @@
 <plugin>
 
 <extension point="org.eclipse.help.toc">
-	<toc file="org.eclipse.jst.server.ui.doc.user_build_toc.xml" />
 	<toc file="tomcat_create.xml" />
 	<toc file="tomcat_pref.xml" /> 
        <index path="index/"/>    
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
index abcdc1f..b2dfd2e 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
@@ -13,6 +13,7 @@
 <meta name="description" content="The server tools feature supports the Apache Tomcat runtime environment, running locally. With Tomcat, you can only test Web projects that contain servlets and JSPs. To set up a server to test projects on Apache Tomcat, complete the following:" />
 <meta content="testing, Web projects, servers, Apache Tomcat, testing with Apache Tomcat" name="DC.subject" />
 <meta content="testing, Web projects, servers, Apache Tomcat, testing with Apache Tomcat" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twtomprf.html" />
 <meta scheme="URI" name="DC.Relation" content="http://wiki.eclipse.org/WTP_Tomcat_FAQ" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tomcat_jst" name="DC.Identifier" />
@@ -75,7 +76,10 @@
 
 </div>
 
-<div><div class="relinfo"><strong>Related information</strong><br />
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/twtomprf.html" title="Using the Preferences page, you can define the server runtime environment definitions for the Apache Tomcat server. To define these definitions, complete the following:">Adding the Apache Tomcat runtimes</a></div>
+</div>
+<div class="relinfo"><strong>Related information</strong><br />
 <div><a href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" target="_blank" title="See this link for additional information about using the Apache Tomcat server with the workbench.">WTP
 Tomcat FAQ</a></div>
 </div>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
index 199c158..4f81034 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Using the Preferences page, you can define the server runtime environment definitions for the Apache Tomcat server. To define these definitions, complete the following:" />
 <meta content="servers, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="DC.subject" />
 <meta content="servers, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tomcat.html" />
 <meta scheme="URI" name="DC.Relation" content="http://wiki.eclipse.org/WTP_Tomcat_FAQ" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twtomprf_jst" name="DC.Identifier" />
@@ -85,7 +86,10 @@
 
 </div>
 
-<div><div class="relinfo"><strong>Related information</strong><br />
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tomcat.html" title="The server tools feature supports the Apache Tomcat runtime environment, running locally. With Tomcat, you can only test Web projects that contain servlets and JSPs. To set up a server to test projects on Apache Tomcat, complete the following:">Creating a Tomcat server</a></div>
+</div>
+<div class="relinfo"><strong>Related information</strong><br />
 <div><a href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" target="_blank" title="See this link for additional information using the Apache Tomcat server with the workbench.">WTP Tomcat FAQ</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build.properties b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
index ea534dd..df0017a 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
@@ -1,18 +1,10 @@
-bin.includes = about.html,\
-               wtp_main_toc.xml,\
-               org.eclipse.wst.server.ui.doc.user.xml,\
-               org.eclipse.wst.server.ui.doc.userindex.xml,\
-               wtp_test.xml,\
-               wtp_debug.xml,\
-               wtp_publish.xml,\
-               wtp_create.xml,\
-               wtp_manage.xml,\
-               wtp_pref.xml,\
-               images/,\
+bin.includes = *.xml,\
                plugin.properties,\
                plugin.xml,\
-               topics/*.htm*,\
-                index/,\
+               about.html,\
+               images/,\
+               topics/*.html,\
+               index/,\
                META-INF/
 src.includes = *.maplist,\
                *.ditamap,\
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/_13.cfs b/docs/org.eclipse.wst.server.ui.doc.user/index/_13.cfs
new file mode 100644
index 0000000..7996c3f
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/_13.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/_14.cfs b/docs/org.eclipse.wst.server.ui.doc.user/index/_14.cfs
deleted file mode 100644
index 6bfea5b..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/_14.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions
index bc963d4..6599ca2 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.
-#Tue May 11 17:52:53 EDT 2010
+#Wed May 12 17:20:26 EDT 2010
 org.eclipse.wst.server.ui.doc.user=org.eclipse.wst.server.ui.doc.user\n1.1.300.qualifier
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies
index 1b8c56d..5b66a06 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.
-#Tue May 11 17:52:53 EDT 2010
+#Wed May 12 17:20:26 EDT 2010
 lucene=1.9.1.v20080530-1600
 analyzer=org.eclipse.help.base\#3.3.101.M20080728_34x?locale\=en
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs
index 86892d6..b116179 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs
@@ -1,38 +1,37 @@
 #This is a generated file; do not edit.
-#Tue May 11 17:52:53 EDT 2010
-/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/cwres.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html=0
+#Wed May 12 17:20:26 EDT 2010
 /org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/cwover.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twpub.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html=0
 /org.eclipse.wst.server.ui.doc.user/topics/twedtins.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html=0
 /org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html=0
 /org.eclipse.wst.server.ui.doc.user/topics/tcreate.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tpref.html=0
-/org.eclipse.wst.server.ui.doc.user/topics/tclean.html=0
 /org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html=0
 /org.eclipse.wst.server.ui.doc.user/topics/testing.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/cwres.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tclean.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twpub.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/cwover.html=0
+/org.eclipse.wst.server.ui.doc.user/topics/tpref.html=0
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/segments b/docs/org.eclipse.wst.server.ui.doc.user/index/segments
index a71379f..f0d4f3f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/segments
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
index ab82340..22a7a99 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml
@@ -15,14 +15,7 @@
 <plugin>
 
 <extension point="org.eclipse.help.toc">
-	<toc file="org.eclipse.wst.server.ui.doc.user.xml" />
 	<toc file="wtp_main_toc.xml" /> 
-	<toc file="wtp_test.xml" /> 
-	<toc file="wtp_debug.xml" /> 
-	<toc file="wtp_publish.xml" /> 
-	<toc file="wtp_create.xml" /> 
-	<toc file="wtp_manage.xml" /> 
-	<toc file="wtp_pref.xml" />
        <index path="index/"/>
 </extension>
 <extension
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.ditamap
deleted file mode 100644
index 5e4dfd8..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.ditamap
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map id="wstservertoolsTOC" title="For building purposes">
-<topicref href="topics/cwflow.dita" navtitle="Which test server will start">
-</topicref>
-<topicref href="topics/cwover.dita" navtitle="Application testing and publishing">
-</topicref>
-<topicref href="topics/cwres.dita" navtitle="Resources used by the Server Tools">
-</topicref>
-<topicref href="topics/rwrcview.dita" navtitle="Servers view"></topicref>
-<topicref href="topics/rwtcpvw.dita" navtitle="TCP/IP Monitor view"></topicref>
-<topicref href="topics/tdbgjsp.dita" navtitle="Debugging a JSP file on a server">
-</topicref>
-<topicref href="topics/tdebug.dita" navtitle="Debugging applications on a server">
-</topicref>
-<topicref href="topics/testing.dita" navtitle="Testing artifacts on a server">
-</topicref>
-<topicref href="topics/tj2ee.dita" navtitle="Testing applications on a server">
-</topicref>
-<topicref href="topics/tlimits.dita" navtitle="Limitations and restrictions">
-</topicref>
-<topicref href="topics/tpref.dita" navtitle="Defining server preferences">
-</topicref>
-<topicref href="topics/tprefaud.dita" navtitle="Defining the audio preference">
-</topicref>
-<topicref href="topics/tpublish.dita" navtitle="Publishing applications to a server">
-</topicref>
-<topicref href="topics/tservlet.dita" navtitle="Debugging a servlet on a server">
-</topicref>
-<topicref href="topics/twaddprj.dita" navtitle="Adding projects to a server">
-</topicref>
-<topicref href="topics/twcrtins.dita" navtitle="Creating a server"></topicref>
-<topicref href="topics/twdelins.dita" navtitle="Deleting a server"></topicref>
-<topicref href="topics/twedtins.dita" navtitle="Editing a server"></topicref>
-<topicref href="topics/twinstprf.dita" navtitle="Defining the installed server runtime environments">
-</topicref>
-<topicref href="topics/twmanage.dita" navtitle="Managing servers "></topicref>
-<topicref href="topics/twprefin.dita" navtitle="Setting a default server">
-</topicref>
-<topicref href="topics/twpub.dita" navtitle="Publishing your application">
-</topicref>
-<topicref href="topics/twremprj.dita" navtitle="Removing a project from a server">
-</topicref>
-<topicref href="topics/twsrtdbg.dita" navtitle="Starting a server in debug mode">
-</topicref>
-<topicref href="topics/twsrtins.dita" navtitle="Starting a server"></topicref>
-<topicref href="topics/twsrvprf.dita" navtitle="Defining the Server preference">
-</topicref>
-<topicref href="topics/twstpins.dita" navtitle="Stopping a server"></topicref>
-<topicref href="topics/twtcpprf.dita" navtitle="Defining the TCP/IP Monitor preference">
-</topicref>
-<topicref href="topics/tcreate.dita" navtitle="Creating, editing, and deleting servers">
-</topicref>
-<topicref href="topics/tmetasrv.dita" navtitle="Displaying or hiding the metadata of the server">
-</topicref>
-<topicref href="topics/twlaunchpref.dita" navtitle="Defining the launching preferences">
-</topicref>
-<topicref href="topics/tmonitorport.dita" navtitle="Monitoring server ports">
-</topicref>
-<topicref href="topics/tclean.dita" navtitle="Cleaning projects published on the server">
-</topicref>
-<topicref href="topics/thttppreview.dita" navtitle="Testing on a HTTP Preview server">
-</topicref>
-<topicref href="topics/tj2eepreview.dita" navtitle="Testing on a J2EE Preview server">
-</topicref>
-<topicref href="topics/raccessserver.dita" navtitle="Keyboard shortcuts for Server Tools">
-</topicref>
-</map>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.maplist b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.maplist
index 10af56d..215a566 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.maplist
+++ b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.maplist
@@ -1,21 +1,8 @@
 <maplist version="3.6.2">
   <nav>
     <map file="wtp_main_toc.ditamap"/>
-    <map file="org.eclipse.wst.server.ui.doc.user.ditamap"/>
-    <map file="wtp_create.ditamap"/>
-    <map file="wtp_debug.ditamap"/>
-    <map file="wtp_manage.ditamap"/>
-    <map file="wtp_pref.ditamap"/>
-    <map file="wtp_publish.ditamap"/>
-    <map file="wtp_test.ditamap"/>
   </nav>
   <link>
-    <map file="wtp_debug.ditamap"/>
-    <map file="wtp_create.ditamap"/>
-    <map file="wtp_manage.ditamap"/>
-    <map file="wtp_pref.ditamap"/>
-    <map file="wtp_publish.ditamap"/>
-    <map file="wtp_test.ditamap"/>
     <map file="wtp_main_toc.ditamap"/>
     <map file="wtp_reltable.ditamap"/>
   </link>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml
deleted file mode 100644
index 1486d3a..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="For building purposes" topic="topics/cwflow.html">
-<topic label="Which server will start" href="topics/cwflow.html"/>
-<topic label="Testing and publishing on your server" href="topics/cwover.html"/>
-<topic label="Resources used to test and publish on your server" href="topics/cwres.html"/>
-<topic label="Servers view" href="topics/rwrcview.html"/>
-<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
-<topic label="Debugging a JSP file on a server" href="topics/tdbgjsp.html"/>
-<topic label="Debugging applications on a server" href="topics/tdebug.html"/>
-<topic label="Testing artifacts on a server" href="topics/testing.html"/>
-<topic label="Testing applications on a server" href="topics/tj2ee.html"/>
-<topic label="Limitations and restrictions" href="topics/tlimits.html"/>
-<topic label="Defining server preferences" href="topics/tpref.html"/>
-<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
-<topic label="Publishing applications to a server" href="topics/tpublish.html"/>
-<topic label="Debugging a servlet on a server" href="topics/tservlet.html"/>
-<topic label="Adding projects to a server" href="topics/twaddprj.html"/>
-<topic label="Creating a server" href="topics/twcrtins.html"/>
-<topic label="Deleting a server" href="topics/twdelins.html"/>
-<topic label="Editing a server" href="topics/twedtins.html"/>
-<topic label="Defining the server runtime environments preferences" href="topics/twinstprf.html"/>
-<topic label="Managing servers" href="topics/twmanage.html"/>
-<topic label="Setting a default server" href="topics/twprefin.html"/>
-<topic label="Publishing your application" href="topics/twpub.html"/>
-<topic label="Removing a project from a server" href="topics/twremprj.html"/>
-<topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
-<topic label="Starting a server" href="topics/twsrtins.html"/>
-<topic label="Defining the server preference" href="topics/twsrvprf.html"/>
-<topic label="Stopping a server" href="topics/twstpins.html"/>
-<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html"/>
-<topic label="Creating, editing, and deleting servers" href="topics/tcreate.html"/>
-<topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
-<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
-<topic label="Monitoring server ports" href="topics/tmonitorport.html"/>
-<topic label="Clean projects published on the server" href="topics/tclean.html"/>
-<topic label="Testing on an HTTP Preview server" href="topics/thttppreview.html"/>
-<topic label="Testing on a J2EE Preview server" href="topics/tj2eepreview.html"/>
-<topic label="Keyboard shortcuts for Server Tools" href="topics/raccessserver.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
index ab82340..22a7a99 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
@@ -15,14 +15,7 @@
 <plugin>
 
 <extension point="org.eclipse.help.toc">
-	<toc file="org.eclipse.wst.server.ui.doc.user.xml" />
 	<toc file="wtp_main_toc.xml" /> 
-	<toc file="wtp_test.xml" /> 
-	<toc file="wtp_debug.xml" /> 
-	<toc file="wtp_publish.xml" /> 
-	<toc file="wtp_create.xml" /> 
-	<toc file="wtp_manage.xml" /> 
-	<toc file="wtp_pref.xml" />
        <index path="index/"/>
 </extension>
 <extension
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
index 2fa6dd2..daa05fd 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html
@@ -106,7 +106,6 @@
 
 </div>
 
-<div />
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
index 4cd3cfd..4df77e2 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You can use the clean option available in the Servers view to remove any invalid resources from the server before doing a full republish. This helps remove by-products generated as a result of the publishing process. When you find there is old code or an invalid state of code running on the server, try using this clean option to see if this helps remove these invalid states from the server." />
 <meta content="servers, cleaning projects, projects, cleaning on server, clean" name="DC.subject" />
 <meta content="servers, cleaning projects, projects, cleaning on server, clean" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tclean_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -52,6 +53,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
index 43b3234..fbab15f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
@@ -13,6 +13,9 @@
 <meta name="description" content="" />
 <meta content="servers, creating, editing, deleting" name="DC.subject" />
 <meta content="servers, creating, editing, deleting" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twcrtins.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twedtins.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twdelins.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tcreate_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -29,6 +32,16 @@
 <div><p />
 </div>
 
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twcrtins.html">Creating a server</a></strong><br />
+You can create a server to identify the runtime environment that you want to use for testing your project resources. The term creating a server defines creating a pointer from the workbench to an existing installation of an application server.</li>
+<li class="ulchildlink"><strong><a href="../topics/twedtins.html">Editing a server</a></strong><br />
+You can edit your server using a server editor. The fields that you change are dependant on what runtime environment the server is defined to use, or whether it is defined as a local or remote server.</li>
+<li class="ulchildlink"><strong><a href="../topics/twdelins.html">Deleting a server</a></strong><br />
+You may delete a server from the Servers view.</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
index 1d12286..a7b201f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html
@@ -13,6 +13,7 @@
 <meta name="description" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a JavaServer Pages (JSP) without losing the state of your application." />
 <meta content="JSP files, debugging, servers, debugging JSP files" name="DC.subject" />
 <meta content="JSP files, debugging, servers, debugging JSP files" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdebug.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tdbgjsp_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -63,7 +64,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdebug.html" title="You can debug applications on a server to detect and diagnose errors in your application. Use the TCP/IP monitor view to view data sent and received over the ports of the server. In addition, use the debugging tools in the workbench to control running your application on the server by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug the following artifacts on a server without losing the state of your application:">Debugging applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
index 18724ba..9c1d0ff 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html
@@ -13,6 +13,9 @@
 <meta name="description" content="You can debug applications on a server to detect and diagnose errors in your application. Use the TCP/IP monitor view to view data sent and received over the ports of the server. In addition, use the debugging tools in the workbench to control running your application on the server by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug the following artifacts on a server without losing the state of your application:" />
 <meta content="servers, debugging applications" name="DC.subject" />
 <meta content="servers, debugging applications" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tservlet.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdbgjsp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tmonitorport.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tdebug_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -35,6 +38,16 @@
 artifacts on a server without losing the state of your application:</p>
 </div>
 
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/tservlet.html">Debugging a servlet on a server</a></strong><br />
+The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application.</li>
+<li class="ulchildlink"><strong><a href="../topics/tdbgjsp.html">Debugging a JSP file on a server</a></strong><br />
+The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a JavaServer Pages (JSP) without losing the state of your application.</li>
+<li class="ulchildlink"><strong><a href="../topics/tmonitorport.html">Monitoring server ports</a></strong><br />
+You can monitor server ports to view data sent and received over the ports of the server. Using the Properties page of a server, you can select from a list of the available types of server ports to monitor. Examples of types of server ports you can monitor are Hypertext Transfer Protocol (HTTP), the administrative port of the server, proxy and many other vendor-specific ports.</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
index 2984085..fc74b65 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You can use the workbench to test one or more application artifacts on a server." />
 <meta content="artifacts, testing on servers, servers, testing artifacts" name="DC.subject" />
 <meta content="artifacts, testing on servers, servers, testing artifacts" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tj2ee.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="testing_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -111,7 +112,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tj2ee.html" title="You can use the workbench to test one or more projects on a server.">Testing applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
index d06915b..bbdd709 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Use the HTTP Preview server when you want to quickly test resources in a static Web project. The HTTP Preview server is a Hypertext Transfer Protocol (HTTP) embedded test server that is integrated with the workbench. It is intended for preliminary testing and saves you time to download, install, and set up an HTTP server. However, as your static Web project progresses through its development cycle you are encourage to test and run on an external HTTP server. You can use the HTTP Preview server as a convenient way to check for errors before you do a final test on an external HTTP server." />
 <meta content="HTTP preview server, testing static Web projects, runtime environments, HTTP Preview, servers, HTTP Preview server" name="DC.subject" />
 <meta content="HTTP preview server, testing static Web projects, runtime environments, HTTP Preview, servers, HTTP Preview server" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tj2ee.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="thttppreview_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -76,7 +77,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tj2ee.html" title="You can use the workbench to test one or more projects on a server.">Testing applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
index 7f8d3de..d9e7727 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
@@ -13,6 +13,9 @@
 <meta name="description" content="You can use the workbench to test one or more projects on a server." />
 <meta content="applications, testing on servers, servers, testing applications" name="DC.subject" />
 <meta content="applications, testing on servers, servers, testing applications" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/testing.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/thttppreview.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tj2eepreview.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tj2ee_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -30,6 +33,16 @@
 on a server. </p>
 </div>
 
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/testing.html">Testing artifacts on a server</a></strong><br />
+You can use the workbench to test one or more application artifacts on a server.</li>
+<li class="ulchildlink"><strong><a href="../topics/thttppreview.html">Testing on an HTTP Preview server</a></strong><br />
+Use the HTTP Preview server when you want to quickly test resources in a static Web project. The HTTP Preview server is a Hypertext Transfer Protocol (HTTP) embedded test server that is integrated with the workbench. It is intended for preliminary testing and saves you time to download, install, and set up an HTTP server. However, as your static Web project progresses through its development cycle you are encourage to test and run on an external HTTP server. You can use the HTTP Preview server as a convenient way to check for errors before you do a final test on an external HTTP server.</li>
+<li class="ulchildlink"><strong><a href="../topics/tj2eepreview.html">Testing on a J2EE Preview server</a></strong><br />
+Use the J2EE Preview server when you want to quickly compile, test and run resources in a J2EE Web project. The J2EE Web projects you can test on a J2EE Preview server are static Web projects, dynamic Web projects and utility projects. Hereafter, the term J2EE Web project refers to any of these previously mentioned projects.</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
index f4c7173..79aa069 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Use the J2EE Preview server when you want to quickly compile, test and run resources in a J2EE Web project. The J2EE Web projects you can test on a J2EE Preview server are static Web projects, dynamic Web projects and utility projects. Hereafter, the term J2EE Web project refers to any of these previously mentioned projects." />
 <meta content="J2EE, testing on preview servers, runtime environments, J2EE Preview, servers, J2EE Preview server" name="DC.subject" />
 <meta content="J2EE, testing on preview servers, runtime environments, J2EE Preview, servers, J2EE Preview server" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tj2ee.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tj2eepreview_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -80,6 +81,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tj2ee.html" title="You can use the workbench to test one or more projects on a server.">Testing applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
index 9095b0e..3097587 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
@@ -13,6 +13,7 @@
 <meta name="description" content="On the workbench, you have the option to display or hide the metadata of the server." />
 <meta content="servers, displaying metadata, hiding metadata, workbench, server metadata, serverName.server file, displaying, serverName.server file, hiding" name="DC.subject" />
 <meta content="servers, displaying metadata, hiding metadata, workbench, server metadata, serverName.server file, displaying, serverName.server file, hiding" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tmetasrv_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -82,6 +83,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
index ff6457d..70c7239 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You can monitor server ports to view data sent and received over the ports of the server. Using the Properties page of a server, you can select from a list of the available types of server ports to monitor. Examples of types of server ports you can monitor are Hypertext Transfer Protocol (HTTP), the administrative port of the server, proxy and many other vendor-specific ports." />
 <meta content="properties, monitoring server ports, ports, servers, views, monitoring server ports" name="DC.subject" />
 <meta content="properties, monitoring server ports, ports, servers, views, monitoring server ports" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdebug.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tmonitorport_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -92,7 +93,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdebug.html" title="You can debug applications on a server to detect and diagnose errors in your application. Use the TCP/IP monitor view to view data sent and received over the ports of the server. In addition, use the debugging tools in the workbench to control running your application on the server by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug the following artifacts on a server without losing the state of your application:">Debugging applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
index 4d8307b..454e95d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
@@ -13,6 +13,11 @@
 <meta name="description" content="The server tools allow you to define the following preferences:" />
 <meta content="preferences, servers, overview" name="DC.subject" />
 <meta content="preferences, servers, overview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twsrvprf.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tprefaud.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twlaunchpref.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twinstprf.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twtcpprf.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tpref_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -30,6 +35,20 @@
 preferences:</p>
 </div>
 
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twsrvprf.html">Defining the server preference</a></strong><br />
+Using the Preferences page, you can define attribute used for testing projects by the servers.</li>
+<li class="ulchildlink"><strong><a href="../topics/tprefaud.html">Defining the audio preferences</a></strong><br />
+Using the Preferences page, you can define the preferences that servers will use for audio purposes.</li>
+<li class="ulchildlink"><strong><a href="../topics/twlaunchpref.html">Defining the launching preferences</a></strong><br />
+Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands.</li>
+<li class="ulchildlink"><strong><a href="../topics/twinstprf.html">Defining the server runtime environments preferences</a></strong><br />
+Using the Preferences page, you can direct the workbench to use a specific runtime environment of an application server for compiling, testing, or running your application.</li>
+<li class="ulchildlink"><strong><a href="../topics/twtcpprf.html">Defining the TCP/IP Monitor preferences</a></strong><br />
+Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
index 7f06655..98e4102 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Using the Preferences page, you can define the preferences that servers will use for audio purposes." />
 <meta content="audio, preferences, servers, workbench, audio preferences" name="DC.subject" />
 <meta content="audio, preferences, servers, workbench, audio preferences" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tprefaud_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -72,7 +73,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tpref.html" title="The server tools allow you to define the following preferences:">Defining server preferences</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
index cea95f2..8722708 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
@@ -13,6 +13,7 @@
 <meta name="description" content="" />
 <meta content="servers, publishing applications" name="DC.subject" />
 <meta content="servers, publishing applications" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twpub.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tpublish_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -29,6 +30,12 @@
 <div><p />
 </div>
 
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twpub.html">Publishing your application</a></strong><br />
+Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created. You can either publish your application automatically or manually.</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
index 9863761..1a4130f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html
@@ -13,6 +13,7 @@
 <meta name="description" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application." />
 <meta content="breakpoints, servlets, servers, debugging servlets, debugging on servers, threads, suspending in servlets" name="DC.subject" />
 <meta content="breakpoints, servlets, servers, debugging servlets, debugging on servers, threads, suspending in servlets" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdebug.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tservlet_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -83,7 +84,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdebug.html" title="You can debug applications on a server to detect and diagnose errors in your application. Use the TCP/IP monitor view to view data sent and received over the ports of the server. In addition, use the debugging tools in the workbench to control running your application on the server by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug the following artifacts on a server without losing the state of your application:">Debugging applications on a server</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
index 1dd1c3c..21875bb 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Once you have created a server, you need to create a relationship between the projects that contain the files you want to test and your server." />
 <meta content="servers, adding projects, projects, adding to a server" name="DC.subject" />
 <meta content="servers, adding projects, projects, adding to a server" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twaddprj_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -53,6 +54,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
index 28fe5c8..bd26b6f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html
@@ -14,6 +14,7 @@
 <meta content="servers, creating, creating a pointer" name="DC.subject" />
 <meta content="servers, creating, creating a pointer" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/twinstprf.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tcreate.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twcrtins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -141,7 +142,11 @@
 
 </div>
 
-<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcreate.html" title="">Creating, editing, and deleting servers</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="../topics/twinstprf.html" title="Using the Preferences page, you can direct the workbench to use a specific runtime environment of an application server for compiling, testing, or running your application.">Defining the server runtime environments preferences</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
index 3fdd6c0..b3ae663 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You may delete a server from the Servers view." />
 <meta content="servers, deleting" name="DC.subject" />
 <meta content="servers, deleting" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tcreate.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twdelins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -77,6 +78,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcreate.html" title="">Creating, editing, and deleting servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
index fadf563..3b622eb 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You can edit your server using a server editor. The fields that you change are dependant on what runtime environment the server is defined to use, or whether it is defined as a local or remote server." />
 <meta content="servers, editing, editors, server" name="DC.subject" />
 <meta content="servers, editing, editors, server" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tcreate.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twedtins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -64,7 +65,11 @@
 
 </div>
 
-<div />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcreate.html" title="">Creating, editing, and deleting servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
index 028d551..2d1df09 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
@@ -13,6 +13,7 @@
 <meta name="description" content="Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands." />
 <meta content="preferences, servers, launching, launching preferences, workbench" name="DC.subject" />
 <meta content="preferences, servers, launching, launching preferences, workbench" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twlaunchpref_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -153,6 +154,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tpref.html" title="The server tools allow you to define the following preferences:">Defining server preferences</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
index 50747bf..d82cd4f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
@@ -13,6 +13,13 @@
 <meta name="description" content="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:" />
 <meta content="servers, managing" name="DC.subject" />
 <meta content="servers, managing" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twaddprj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twremprj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twsrtins.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twstpins.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twprefin.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tmetasrv.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tclean.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twmanage_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -30,7 +37,24 @@
 The following tasks may be included as part of the development path:</p>
 </div>
 
-<div />
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twaddprj.html">Adding projects to a server</a></strong><br />
+Once you have created a server, you need to create a relationship between the projects that contain the files you want to test and your server.</li>
+<li class="ulchildlink"><strong><a href="../topics/twremprj.html">Removing a project from a server</a></strong><br />
+To remove a project from a server:</li>
+<li class="ulchildlink"><strong><a href="../topics/twsrtins.html">Starting a server</a></strong><br />
+When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic.</li>
+<li class="ulchildlink"><strong><a href="../topics/twstpins.html">Stopping a server</a></strong><br />
+You can stop the server from the Servers view.</li>
+<li class="ulchildlink"><strong><a href="../topics/twprefin.html">Setting a default server</a></strong><br />
+A default server is the server that you want to use when a project has more than one server defined.</li>
+<li class="ulchildlink"><strong><a href="../topics/tmetasrv.html">Displaying or hiding the metadata of the server</a></strong><br />
+On the workbench, you have the option to display or hide the metadata of the server.</li>
+<li class="ulchildlink"><strong><a href="../topics/tclean.html">Clean projects published on the server</a></strong><br />
+You can use the clean option available in the Servers view to remove any invalid resources from the server before doing a full republish. This helps remove by-products generated as a result of the publishing process. When you find there is old code or an invalid state of code running on the server, try using this clean option to see if this helps remove these invalid states from the server.</li>
+</ul>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
index 1850a39..4adc0d6 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html
@@ -13,6 +13,7 @@
 <meta name="description" content="A default server is the server that you want to use when a project has more than one server defined." />
 <meta content="projects, setting default servers, servers, setting project defaults" name="DC.subject" />
 <meta content="projects, setting default servers, servers, setting project defaults" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twprefin_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -49,6 +50,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
index de1df71..d062003 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html
@@ -14,6 +14,7 @@
 <meta content="applications, publishing to servers, servers, publishing applications" name="DC.subject" />
 <meta content="applications, publishing to servers, servers, publishing applications" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/twsrvprf.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tpublish.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twpub_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -104,7 +105,11 @@
 
 </div>
 
-<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tpublish.html" title="">Publishing applications to a server</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="../topics/twsrvprf.html" title="Using the Preferences page, you can define attribute used for testing projects by the servers.">Defining the server preference</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
index 215f00b..c983d8c 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html
@@ -13,6 +13,7 @@
 <meta name="description" content="To remove a project from a server:" />
 <meta content="servers, removing projects, projects, removing from a server" name="DC.subject" />
 <meta content="servers, removing projects, projects, removing from a server" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twremprj_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -45,6 +46,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
index 3a306d8..cf38193 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html
@@ -66,7 +66,6 @@
 
 </div>
 
-<div />
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
index 39b1aee..bd9839b 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
@@ -14,6 +14,7 @@
 <meta content="applications, starting servers for testing, projects, starting servers for testing, servers, starting for testing" name="DC.subject" />
 <meta content="applications, starting servers for testing, projects, starting servers for testing, servers, starting for testing" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cwflow.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twsrtins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -82,7 +83,11 @@
 
 </div>
 
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+<div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="../topics/cwflow.html" title="You can start the server automatically as part of running a selected resource on the server, or you can simply start the server without running resources on the server. For example, the server is automatically started when you right-click a project or an application resource in the Project Explorer view and select Run As &gt; Run on Server. If you want to start the server without running resources on the server, in the Servers view select a server and select the Start the server This is an image of the Run on Server icon icon, the Start the server in debug mode This is an image of the Debug on server icon. icon , or the Start the server in profiling mode This is an image of the Start the server in profiling mode icon. icon.">Which server will start</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
index c618285..2156d36 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html
@@ -14,6 +14,7 @@
 <meta content="preferences, servers, testing, views, server preferences" name="DC.subject" />
 <meta content="preferences, servers, testing, views, server preferences" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/twpub.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twsrvprf_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -53,7 +54,11 @@
 
 </div>
 
-<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tpref.html" title="The server tools allow you to define the following preferences:">Defining server preferences</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
 <div><a href="../topics/twpub.html" title="Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created. You can either publish your application automatically or manually.">Publishing your application</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
index a84b2fb..2218c48 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
@@ -13,6 +13,7 @@
 <meta name="description" content="You can stop the server from the Servers view." />
 <meta content="servers, stopping" name="DC.subject" />
 <meta content="servers, stopping" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twmanage.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twstpins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -66,6 +67,11 @@
 
 </div>
 
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/twmanage.html" title="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:">Managing servers</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
index 54f50c4..1569992 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html
@@ -15,6 +15,7 @@
 <meta content="preferences, TCP/IP Monitor, TCP/IP, views, TCP/IP monitors" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rwtcpvw.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rwtcpvw.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tpref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twtcpprf_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -110,7 +111,11 @@
 
 </div>
 
-<div><div class="relref"><strong>Related reference</strong><br />
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tpref.html" title="The server tools allow you to define the following preferences:">Defining server preferences</a></div>
+</div>
+<div class="relref"><strong>Related reference</strong><br />
 <div><a href="../topics/rwtcpvw.html" title="The TCP/IP Monitor is a simple server that monitors all the requests and the responses between a Web browser and server. If you want the TCP/IP Monitor view to open when there is TCP/IP activity, select the Show TCP/IP Monitor view when there is activity check box on the TCP/IP Monitor preferences page ( Window &gt; Run/Debug &gt; TCP/IP Monitor).">TCP/IP Monitor view</a></div>
 </div>
 </div>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap
deleted file mode 100644
index ccd81dc..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map title="Creating servers" xml:lang="en-us">
-<topicref href="topics/tcreate.dita" id="create_server" locktitle="yes"
-navtitle="Creating, editing and deleting servers">
-<topicref href="topics/twcrtins.dita" linking="none" locktitle="yes"
-navtitle="Creating a server ">
-<navref
-mapref="../org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap"/><?Pub
-Caret -2?>
-<topicref href="topics/thttppreview.dita" locktitle="yes"
-navtitle="...HTTP Preview server"></topicref>
-<topicref href="topics/tj2eepreview.dita" locktitle="yes"
-navtitle="...J2EE Preview server"></topicref>
-</topicref>
-<topicref href="topics/twedtins.dita" locktitle="yes"
-navtitle="Editing a server"></topicref>
-<topicref href="topics/twdelins.dita" locktitle="yes"
-navtitle="Deleting a server"></topicref>
-</topicref>
-</map>
-<?Pub *0000000994?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml
deleted file mode 100644
index 4441352..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Creating servers" topic="topics/tcreate.html">
-<topic label="Creating, editing and deleting servers" href="topics/tcreate.html">
-<topic label="Creating a server " href="topics/twcrtins.html">
-<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_create.xml"/>
-<topic label="...HTTP Preview server" href="topics/thttppreview.html"/>
-<topic label="...J2EE Preview server" href="topics/tj2eepreview.html"/>
-</topic>
-<topic label="Editing a server" href="topics/twedtins.html"/>
-<topic label="Deleting a server" href="topics/twdelins.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.ditamap
deleted file mode 100644
index cc6f2fd..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.ditamap
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map title="Debugging applications on a server">
-<topicref href="topics/tdebug.dita" id="debug_server" navtitle="Debugging applications on a server">
-<topicref href="topics/tservlet.dita" navtitle="Debugging a servlet on a server">
-<topicmeta>
-<shortdesc></shortdesc>
-</topicmeta>
-</topicref>
-<topicref href="topics/tdbgjsp.dita" navtitle="Debugging a JSP file on a server">
-<topicmeta>
-<shortdesc></shortdesc>
-</topicmeta>
-</topicref>
-<topicref href="topics/tmonitorport.dita" navtitle="Monitoring server ports">
-<topicmeta>
-<shortdesc></shortdesc>
-</topicmeta><?Pub Caret?>
-</topicref>
-</topicref>
-</map>
-<?Pub *0000000807?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
deleted file mode 100644
index d05bb22..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Debugging applications on a server" topic="topics/tdebug.html">
-<topic label="Debugging applications on a server" href="topics/tdebug.html">
-<topic label="Debugging a servlet on a server" href="topics/tservlet.html"/>
-<topic label="Debugging a JSP file on a server" href="topics/tdbgjsp.html"/>
-<topic label="Monitoring server ports" href="topics/tmonitorport.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap
index 1b05d67..1eb9218 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap
@@ -1,24 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <?Pub Sty _display FontColor="red"?>
-<map title="Testing and publishing applications">
-<topicref href="topics/cwover.dita" linking="normal" locktitle="yes" navtitle="Application testing and publishing"
-scope="peer">
-<topicref href="topics/rwrcview.dita" locktitle="yes" navtitle="Servers view">
-<topicref href="topics/raccessserver.dita" navtitle="Keyboard shortcuts for Server Tools"><?Pub Caret?>
+<map title="Testing and publishing applications" xml:lang="en-us">
+<topicref href="topics/cwover.dita" linking="normal" locktitle="yes"
+navtitle="Testing and publishing on your server" scope="peer">
+<topicref href="topics/rwrcview.dita" locktitle="yes"
+navtitle="Servers view">
+<topicref href="topics/raccessserver.dita"
+navtitle="Keyboard shortcuts for Server Tools"></topicref>
+</topicref><?Pub Caret -2?>
+<topicref href="topics/cwres.dita" locktitle="yes"
+navtitle="Resources used by the Server Tools"></topicref>
+<topicref href="topics/cwflow.dita" locktitle="yes"
+navtitle="Which server will start"></topicref>
+<topicref href="topics/tj2ee.dita" id="testing" linking="normal"
+locktitle="yes" navtitle="Testing applications on a server">
+<topicref href="topics/testing.dita" locktitle="yes"
+navtitle="Testing artifacts on a server"></topicref>
+<topicref href="topics/thttppreview.dita" locktitle="yes"
+navtitle="Testing on a HTTP Preview server"></topicref>
+<topicref href="topics/tj2eepreview.dita" locktitle="yes"
+navtitle="Testing on a J2EE Preview server"></topicref>
+</topicref>
+<topicref href="topics/tdebug.dita" id="debug_server"
+navtitle="Debugging applications on a server">
+<topicref href="topics/tservlet.dita"
+navtitle="Debugging a servlet on a server">
+<topicmeta>
+<shortdesc></shortdesc>
+</topicmeta>
+</topicref>
+<topicref href="topics/tdbgjsp.dita"
+navtitle="Debugging a JSP file on a server">
+<topicmeta>
+<shortdesc></shortdesc>
+</topicmeta>
+</topicref>
+<topicref href="topics/tmonitorport.dita"
+navtitle="Monitoring server ports">
+<topicmeta>
+<shortdesc></shortdesc>
+</topicmeta>
 </topicref>
 </topicref>
-<topicref href="topics/cwres.dita" locktitle="yes" navtitle="Resources used by the Server Tools">
+<topicref href="topics/tpublish.dita" id="publish_server" locktitle="yes"
+navtitle="Publishing applications to a server">
+<topicref href="topics/twpub.dita" locktitle="yes"
+navtitle="Publishing your application"></topicref>
 </topicref>
-<topicref href="topics/cwflow.dita" locktitle="yes" navtitle="Which server will start">
+<topicref href="topics/tcreate.dita" id="create_server" locktitle="yes"
+navtitle="Creating, editing and deleting servers">
+<topicref href="topics/twcrtins.dita" linking="none" locktitle="yes"
+navtitle="Creating a server ">
+<navref
+mapref="../org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap"/>
+<topicref href="topics/thttppreview.dita" locktitle="yes"
+navtitle="...HTTP Preview server"></topicref>
+<topicref href="topics/tj2eepreview.dita" locktitle="yes"
+navtitle="...J2EE Preview server"></topicref>
 </topicref>
-<navref mapref="wtp_test.ditamap"/>
-<navref mapref="wtp_debug.ditamap"/>
-<navref mapref="wtp_publish.ditamap"/>
-<navref mapref="wtp_create.ditamap"/>
-<navref mapref="wtp_manage.ditamap"/>
-<navref mapref="wtp_pref.ditamap"/></topicref>
+<topicref href="topics/twedtins.dita" locktitle="yes"
+navtitle="Editing a server"></topicref>
+<topicref href="topics/twdelins.dita" locktitle="yes"
+navtitle="Deleting a server"></topicref>
+</topicref>
+<topicref href="topics/twmanage.dita" id="manage_server" locktitle="yes"
+navtitle="Managing servers ">
+<topicref href="topics/twaddprj.dita" locktitle="yes"
+navtitle="Adding projects to a server "></topicref>
+<topicref href="topics/twremprj.dita" locktitle="yes"
+navtitle="Removing a project from a server"></topicref>
+<topicref href="topics/twsrtins.dita" locktitle="yes"
+navtitle="Starting a server">
+<topicref href="topics/twsrtdbg.dita" locktitle="yes"
+navtitle="Starting a server in debug mode"></topicref>
+</topicref>
+<topicref href="topics/twstpins.dita" locktitle="yes"
+navtitle="Stopping a server"></topicref>
+<topicref href="topics/twprefin.dita" locktitle="yes"
+navtitle="Setting a default server"></topicref>
+<topicref href="topics/tmetasrv.dita" locktitle="yes"
+navtitle="Displaying or hiding the metadata of the server"></topicref>
+<topicref href="topics/tclean.dita" locktitle="yes"
+navtitle="Cleaning projects published on the server"></topicref>
+</topicref>
+<topicref href="topics/tpref.dita" id="pref_server" locktitle="yes"
+navtitle="Defining server preferences">
+<topicref href="topics/twsrvprf.dita" locktitle="yes"
+navtitle="Defining the server preferences"></topicref>
+<topicref href="topics/tprefaud.dita" locktitle="yes"
+navtitle="Defining the audio preferences"></topicref>
+<topicref href="topics/twlaunchpref.dita" locktitle="yes"
+navtitle="Defining the launching preferences"></topicref>
+<topicref href="topics/twinstprf.dita" locktitle="yes"
+navtitle="Defining the server runtime environments preferences">
+<navref
+mapref="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap"/>
+</topicref>
+<topicref href="topics/twtcpprf.dita" locktitle="yes"
+navtitle="Defining the TCP/IP Monitor preferences">
+<topicref href="topics/rwtcpvw.dita" linking="sourceonly" locktitle="yes"
+navtitle="TCP/IP Monitor view"></topicref>
+</topicref>
+</topicref>
+</topicref>
 </map>
-<?Pub *0000001038?>
+<?Pub *0000004676?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
index 5d38f11..f432457 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -3,17 +3,55 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 
 <toc label="Testing and publishing applications" topic="topics/cwover.html">
-<topic label="Application testing and publishing" href="topics/cwover.html">
+<topic label="Testing and publishing on your server" href="topics/cwover.html">
 <topic label="Servers view" href="topics/rwrcview.html">
 <topic label="Keyboard shortcuts for Server Tools" href="topics/raccessserver.html"/>
 </topic>
 <topic label="Resources used by the Server Tools" href="topics/cwres.html"/>
 <topic label="Which server will start" href="topics/cwflow.html"/>
-<link toc="wtp_test.xml"/>
-<link toc="wtp_debug.xml"/>
-<link toc="wtp_publish.xml"/>
-<link toc="wtp_create.xml"/>
-<link toc="wtp_manage.xml"/>
-<link toc="wtp_pref.xml"/>
+<topic label="Testing applications on a server" href="topics/tj2ee.html">
+<topic label="Testing artifacts on a server" href="topics/testing.html"/>
+<topic label="Testing on a HTTP Preview server" href="topics/thttppreview.html"/>
+<topic label="Testing on a J2EE Preview server" href="topics/tj2eepreview.html"/>
+</topic>
+<topic label="Debugging applications on a server" href="topics/tdebug.html">
+<topic label="Debugging a servlet on a server" href="topics/tservlet.html"/>
+<topic label="Debugging a JSP file on a server" href="topics/tdbgjsp.html"/>
+<topic label="Monitoring server ports" href="topics/tmonitorport.html"/>
+</topic>
+<topic label="Publishing applications to a server" href="topics/tpublish.html">
+<topic label="Publishing your application" href="topics/twpub.html"/>
+</topic>
+<topic label="Creating, editing and deleting servers" href="topics/tcreate.html">
+<topic label="Creating a server " href="topics/twcrtins.html">
+<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_create.xml"/>
+<topic label="...HTTP Preview server" href="topics/thttppreview.html"/>
+<topic label="...J2EE Preview server" href="topics/tj2eepreview.html"/>
+</topic>
+<topic label="Editing a server" href="topics/twedtins.html"/>
+<topic label="Deleting a server" href="topics/twdelins.html"/>
+</topic>
+<topic label="Managing servers " href="topics/twmanage.html">
+<topic label="Adding projects to a server " href="topics/twaddprj.html"/>
+<topic label="Removing a project from a server" href="topics/twremprj.html"/>
+<topic label="Starting a server" href="topics/twsrtins.html">
+<topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
+</topic>
+<topic label="Stopping a server" href="topics/twstpins.html"/>
+<topic label="Setting a default server" href="topics/twprefin.html"/>
+<topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
+<topic label="Cleaning projects published on the server" href="topics/tclean.html"/>
+</topic>
+<topic label="Defining server preferences" href="topics/tpref.html">
+<topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
+<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
+<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
+<topic label="Defining the server runtime environments preferences" href="topics/twinstprf.html">
+<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
+</topic>
+<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
+<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+</topic>
+</topic>
 </topic>
 </toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.ditamap
deleted file mode 100644
index cce21cd..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.ditamap
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<?Pub Inc?>
-<map title="Managing Servers">
-<topicref href="topics/twmanage.dita" id="manage_server" locktitle="yes" navtitle="Managing servers ">
-<topicref href="topics/twaddprj.dita" locktitle="yes" navtitle="Adding projects to a server ">
-</topicref>
-<topicref href="topics/twremprj.dita" locktitle="yes" navtitle="Removing a project from a server">
-</topicref>
-<topicref href="topics/twsrtins.dita" locktitle="yes" navtitle="Starting a server">
-<topicref href="topics/twsrtdbg.dita" locktitle="yes" navtitle="Starting a server in debug mode">
-</topicref>
-</topicref>
-<topicref href="topics/twstpins.dita" locktitle="yes" navtitle="Stopping a server">
-</topicref>
-<topicref href="topics/twprefin.dita" locktitle="yes" navtitle="Setting a default server">
-</topicref>
-<topicref href="topics/tmetasrv.dita" locktitle="yes" navtitle="Displaying or hiding the metadata of the server">
-</topicref>
-<topicref href="topics/tclean.dita" locktitle="yes" navtitle="Cleaning projects published on the server"><?Pub Caret?>
-</topicref>
-</topicref>
-</map>
-<?Pub *0000001245?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
deleted file mode 100644
index 79fb41a..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Managing Servers" topic="topics/twmanage.html">
-<topic label="Managing servers " href="topics/twmanage.html">
-<topic label="Adding projects to a server " href="topics/twaddprj.html"/>
-<topic label="Removing a project from a server" href="topics/twremprj.html"/>
-<topic label="Starting a server" href="topics/twsrtins.html">
-<topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
-</topic>
-<topic label="Stopping a server" href="topics/twstpins.html"/>
-<topic label="Setting a default server" href="topics/twprefin.html"/>
-<topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
-<topic label="Cleaning projects published on the server" href="topics/tclean.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.ditamap
deleted file mode 100644
index 106b857..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.ditamap
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map title="Server Preferences" xml:lang="en-us">
-<topicref href="topics/tpref.dita" id="pref_server" locktitle="yes"
-navtitle="Defining server preferences">
-<topicref href="topics/twsrvprf.dita" locktitle="yes"
-navtitle="Defining the server preferences"></topicref>
-<topicref href="topics/tprefaud.dita" locktitle="yes"
-navtitle="Defining the audio preferences"></topicref>
-<topicref href="topics/twlaunchpref.dita" locktitle="yes"
-navtitle="Defining the launching preferences"></topicref>
-<topicref href="topics/twinstprf.dita" locktitle="yes"
-navtitle="Defining the server runtime environments preferences">
-<navref
-mapref="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap"/><?Pub
-Caret -2?></topicref>
-<topicref href="topics/twtcpprf.dita" locktitle="yes"
-navtitle="Defining the TCP/IP Monitor preferences">
-<topicref href="topics/rwtcpvw.dita" linking="sourceonly" locktitle="yes"
-navtitle="TCP/IP Monitor view"></topicref>
-</topicref>
-</topicref>
-</map>
-<?Pub *0000001169?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml
deleted file mode 100644
index c68392f..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Server Preferences" topic="topics/tpref.html">
-<topic label="Defining server preferences" href="topics/tpref.html">
-<topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
-<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
-<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
-<topic label="Defining the server runtime environments preferences" href="topics/twinstprf.html">
-<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
-</topic>
-<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
-<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
-</topic>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.ditamap
deleted file mode 100644
index d7f49f6..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.ditamap
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="publishing">
-<topicref href="topics/tpublish.dita" id="publish_server" locktitle="yes"
-navtitle="Publishing applications to a server">
-<topicref href="topics/twpub.dita" locktitle="yes" navtitle="Publishing your application"><?Pub Caret?>
-</topicref>
-</topicref>
-</map>
-<?Pub *0000000445?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
deleted file mode 100644
index 0f6251b..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="publishing" topic="topics/tpublish.html">
-<topic label="Publishing applications to a server" href="topics/tpublish.html">
-<topic label="Publishing your application" href="topics/twpub.html"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap
index e99f708..f05990d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap
@@ -84,7 +84,142 @@
 </relcell>
 <relcell></relcell>
 <relcell></relcell>
-</relrow><?Pub Caret -2?>
+</relrow>
+<relrow>
+<relcell></relcell>
+<relcell>
+<!--Testing-->
+<topicref href="topics/tj2ee.dita"
+navtitle="Testing applications on a server">
+<topicref href="topics/testing.dita"
+navtitle="Testing artifacts on a server"></topicref>
+<topicref href="topics/thttppreview.dita" locktitle="yes"
+navtitle="Testing on a HTTP Preview server" scope="local">
+<topicmeta>
+<shortdesc>Use the HTTP Preview server when you want to quickly test
+resources in a static Web project.  The HTTP Preview server is a Hypertext
+Transfer Protocol (HTTP) embedded test server that is integrated with
+the workbench.  It is intended for preliminary testing and saves you
+time to download, install, and set up an HTTP server.  However, as
+your static Web project progresses through its development cycle you
+are encourage to test and run on an external HTTP server.  You can
+use the HTTP Preview server as a convenient way to check for errors
+before you do a final test on an external HTTP server.</shortdesc>
+</topicmeta>
+</topicref>
+<topicref href="topics/tj2eepreview.dita" locktitle="yes"
+navtitle="Testing on a J2EE Preview server" scope="local">
+<topicmeta>
+<shortdesc>Use the J2EE Preview server when you want to quickly compile,
+test and run resources in a J2EE Web project. The J2EE Web projects
+you can test on a J2EE Preview server are static Web projects, dynamic
+Web projects and utility projects.  Hereafter, the term J2EE Web project
+refers to any of these previously mentioned projects.</shortdesc>
+</topicmeta>
+</topicref>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<!--Debugging-->
+<relrow>
+<relcell></relcell>
+<relcell>
+<topicref href="topics/tdebug.dita"
+navtitle="Debugging applications on a server">
+<topicref href="topics/tservlet.dita"
+navtitle="Debugging a servlet on a server"></topicref>
+<topicref href="topics/tdbgjsp.dita"
+navtitle="Debugging a JSP file on a server"></topicref>
+<topicref href="topics/tmonitorport.dita"
+navtitle="Monitoring server ports"></topicref><?Pub Caret -1?>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<!--Publishing-->
+<relrow>
+<relcell></relcell>
+<relcell>
+<topicref href="topics/tpublish.dita" id="publish_server"
+navtitle="Publishing applications to a server">
+<topicref href="topics/twpub.dita" navtitle="Publishing your application">
+</topicref>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<!--Creating-->
+<relrow>
+<relcell></relcell>
+<relcell collection-type="family">
+<topicref href="topics/tcreate.dita" type="topic">
+<topicref href="topics/twcrtins.dita" locktitle="yes"
+navtitle="Creating a server" type="task"></topicref>
+<topicref href="topics/twedtins.dita" locktitle="yes"
+navtitle="Editing a server" type="task"></topicref>
+<topicref href="topics/twdelins.dita" locktitle="yes"
+navtitle="Deleting a server" type="task"></topicref>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<!--Managing-->
+<relrow>
+<relcell></relcell>
+<relcell>
+<topicref href="topics/twmanage.dita" id="manage_server"
+navtitle="Managing servers ">
+<topicref href="topics/twaddprj.dita" locktitle="yes"
+navtitle="Adding projects to a server "></topicref>
+<topicref href="topics/twremprj.dita" locktitle="yes"
+navtitle="Removing a project from a server"></topicref>
+<topicref href="topics/twsrtins.dita" locktitle="yes"
+navtitle="Starting a server"></topicref>
+<topicref href="topics/twstpins.dita" locktitle="yes"
+navtitle="Stopping a server"></topicref>
+<topicref href="topics/twprefin.dita" locktitle="yes"
+navtitle="Setting a default server"></topicref>
+<topicref href="topics/tmetasrv.dita" locktitle="yes"
+navtitle="Displaying or hiding the metadata of the server"></topicref>
+<topicref href="topics/tclean.dita" locktitle="yes"
+navtitle="Cleaning projects published on the server"></topicref>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
+<!--Preferences-->
+<relrow>
+<relcell></relcell>
+<relcell>
+<topicref href="topics/tpref.dita" navtitle="Defining server preferences">
+<topicref href="topics/twsrvprf.dita"
+navtitle="Defining the server preferences"></topicref>
+<topicref href="topics/tprefaud.dita"
+navtitle="Defining the audio preferences"></topicref>
+<topicref href="topics/twlaunchpref.dita"
+navtitle="Defining the launching preferences"></topicref>
+<topicref href="topics/twinstprf.dita"
+navtitle="Defining the server runtime environments preferences"
+scope="peer">
+<topicmeta>
+<shortdesc>Using the Preferences page, you can direct the workbench
+to use a specific runtime environment of an application server for
+compiling, testing, or running your application.</shortdesc>
+</topicmeta>
+</topicref>
+<topicref href="topics/twtcpprf.dita"
+navtitle="Defining the TCP/IP Monitor preferences"></topicref>
+</topicref>
+</relcell>
+<relcell></relcell>
+<relcell></relcell>
+</relrow>
 </reltable>
 </map>
-<?Pub *0000002400?>
+<?Pub *0000007218?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.ditamap
deleted file mode 100644
index 308f5a2..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.ditamap
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map title="Testing J2EE projects">
-<topicref href="topics/tj2ee.dita" id="testing" linking="normal" locktitle="yes"
-navtitle="Testing applications on a server">
-<topicref href="topics/testing.dita" locktitle="yes" navtitle="Testing artifacts on a server">
-</topicref>
-<topicref href="topics/thttppreview.dita" locktitle="yes" navtitle="Testing on a HTTP Preview server"><?Pub Caret?>
-</topicref>
-<topicref href="topics/tj2eepreview.dita" locktitle="yes" navtitle="Testing on a J2EE Preview server">
-</topicref>
-</topicref>
-</map>
-<?Pub *0000000731?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
deleted file mode 100644
index bef9281..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Testing J2EE projects" topic="topics/tj2ee.html">
-<topic label="Testing applications on a server" href="topics/tj2ee.html">
-<topic label="Testing artifacts on a server" href="topics/testing.html"/>
-<topic label="Testing on a HTTP Preview server" href="topics/thttppreview.html"/>
-<topic label="Testing on a J2EE Preview server" href="topics/tj2eepreview.html"/>
-</topic>
-</toc>