[229175] server tools doc updates for wst 3.0
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
index c3c5bf6..49bd471 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
@@ -23,7 +23,9 @@
 	- Created.
 	2008-01-09 Kate Price <katep@ca.ibm.com>
 	- modified for new DITA-OT version
-
+	2008-05-05 Kate Price <katep@ca.ibm.com>
+	- modified to add generation of pre-built help index. 
+	- Must delete /index folder before running build
 -->
 <project name="eclipsehelp" default="all">
 
@@ -58,4 +60,7 @@
 		</ant>
 		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
 	</target>
+	<target name="build.index" description="Builds search index for the plug-in">
+	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
+	</target>
 </project>
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
deleted file mode 100644
index 91a4ecf..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/_13.cfs
+++ /dev/null
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
new file mode 100644
index 0000000..2417911
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/_14.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/deletable b/docs/org.eclipse.wst.server.ui.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.server.ui.doc.user/index/deletable
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 bd73cde..9036ae0 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.

-#Wed May 09 14:14:42 EDT 2007

-org.eclipse.wst.server.ui.doc.user=org.eclipse.wst.server.ui.doc.user\n1.0.303.qualifier

+#Mon May 12 16:59:50 EDT 2008

+org.eclipse.wst.server.ui.doc.user=org.eclipse.wst.server.ui.doc.user\n1.1.0.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 03cdb9b..6a57342 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.

-#Wed May 09 14:14:42 EDT 2007

-lucene=1.4.103.v20060601

-analyzer=org.eclipse.help.base\#3.2.0.v20060601?locale\=en

+#Mon May 12 16:59:51 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?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 0b89a64..12cf053 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,37 +1,38 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:14:42 EDT 2007

-/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html=0

+#Mon May 12 16:59:51 EDT 2008

+/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/rwrcview.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

+/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/thttppreview.html=0

+/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.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/testing.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/../org.eclipse.wst.server.ui.doc.user/topics/rwrcview.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/twinstprf.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.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/../org.eclipse.wst.server.ui.doc.user/topics/cwover.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/../org.eclipse.wst.server.ui.doc.user/topics/cwres.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/tpref.html=0

-/org.eclipse.wst.server.ui.doc.user/topics/cwover.html=0

-/org.eclipse.wst.server.ui.doc.user/../org.eclipse.wst.server.ui.doc.user/topics/cwflow.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 19b5d0c..a837180 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/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
index 805cb20..5e4dfd8 100644
--- 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
@@ -2,8 +2,7 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

  "map.dtd">

-<?Pub Sty _display FontColor="red"?>

-<map title="For building purposes">

+<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">

@@ -66,7 +65,6 @@
 </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"><?Pub Caret?>

+<topicref href="topics/raccessserver.dita" navtitle="Keyboard shortcuts for Server Tools">

 </topicref>

 </map>

-<?Pub *0000003560?>

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
index ecb47cf..1486d3a 100644
--- 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
@@ -21,7 +21,7 @@
 <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 installed server runtime environments preferences" href="topics/twinstprf.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"/>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.html b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.html
deleted file mode 100644
index 9336a9f..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.userindex.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_41" href="#IDX1_41">A</a>
-<a name="IDX0_42" href="#IDX1_42">B</a>
-<a name="IDX0_45" href="#IDX1_45">E</a>
-<a name="IDX0_4A" href="#IDX1_4A">J</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_52" href="#IDX1_52">R</a>
-<a name="IDX0_53" href="#IDX1_53">S</a>
-<a name="IDX0_54" href="#IDX1_54">T</a>
-<a name="IDX0_56" href="#IDX1_56">V</a>
-<a name="IDX0_57" href="#IDX1_57">W</a>
-<hr></hr>
-<strong><a name="IDX1_41" href="#IDX0_41">A</a></strong>
-<ul class="indexlist">
-<li>application client projects
-<ul class="indexlist">
-<li><a href="topics/cwover.html#cwover_wst">testing on servers</a>
-</li>
-</ul>
-</li>
-<li>applications
-<ul class="indexlist">
-<li><a href="topics/twpub.html#twpub_wst">publishing to servers</a>
-</li>
-<li><a href="topics/twsrtdbg.html#twsrtdbg_wst">running on servers in debug mode</a>
-</li>
-<li><a href="topics/twinstprf.html#twinstprf_wst">server runtime environments</a>
-</li>
-<li><a href="topics/twsrtins.html#twsrtins_wst">starting servers for testing</a>
-</li>
-<li><a href="topics/tj2ee.html#tj2ee_wst">testing on servers</a>
-</li>
-</ul>
-</li>
-<li>artifacts
-<ul class="indexlist">
-<li><a href="topics/testing.html#testing_wst">testing on servers</a>
-</li>
-</ul>
-</li>
-<li>audio preferences
-<ul class="indexlist">
-<li><a href="topics/tprefaud.html#tprefaud_wst">setting</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_42" href="#IDX0_42">B</a></strong>
-<ul class="indexlist">
-<li>breakpoints
-<ul class="indexlist">
-<li><a href="topics/tservlet.html#tservlet_wst">adding to servlets</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_45" href="#IDX0_45">E</a></strong>
-<ul class="indexlist">
-<li>editors
-<ul class="indexlist">
-<li><a href="topics/twedtins.html#twedtins_wst">server</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
-<ul class="indexlist">
-<li>JSP files
-<ul class="indexlist">
-<li><a href="topics/tdbgjsp.html#tdbgjsp_wst">debugging on a server</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>preferences
-<ul class="indexlist">
-<li><a href="topics/cwres.html#cwres_wst">installed server runtime environments</a>
-</li>
-<li><a href="topics/tprefaud.html#tprefaud_wst">server audio</a>
-</li>
-<li><a href="topics/twlaunchpref.html#twlaunchpref_wst">server launches</a>
-</li>
-<li>servers
-<ul class="indexlist">
-<li><a href="topics/tpref.html#tpref_wst">overview</a>
-</li>
-<li><a href="topics/twsrvprf.html#twsrvprf_wst">testing</a>
-</li>
-</ul>
-</li>
-<li><a href="topics/twtcpprf.html#twtcpprf_wst">TCP/IP Monitor</a>
-</li>
-</ul>
-</li>
-<li>projects
-<ul class="indexlist">
-<li><a href="topics/twaddprj.html#twaddprj_wst">adding to a server</a>
-</li>
-<li><a href="topics/twremprj.html#twremprj_wst">removing from a server</a>
-</li>
-<li><a href="topics/twsrtdbg.html#twsrtdbg_wst">running on servers in debug mode</a>
-</li>
-<li><a href="topics/twprefin.html#twprefin_wst">setting default servers</a>
-</li>
-<li><a href="topics/twsrtins.html#twsrtins_wst">starting servers for testing</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
-<ul class="indexlist">
-<li>runtime environments
-<ul class="indexlist">
-<li><a href="topics/twcrtins.html#twcrtins_wst">creating servers</a>
-</li>
-<li><a href="topics/cwres.html#cwres_wst">description</a>
-</li>
-<li><a href="topics/twinstprf.html#twinstprf_wst">preferences</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_53" href="#IDX0_53">S</a></strong>
-<ul class="indexlist">
-<li>serverName.server file
-<ul class="indexlist">
-<li><a href="topics/tmetasrv.html#tmetasrv_wst">displaying on workbench</a>
-</li>
-</ul>
-</li>
-<li>servers
-<ul class="indexlist">
-<li><a href="topics/twaddprj.html#twaddprj_wst">adding projects</a>
-</li>
-<li>creating <a href="topics/twcrtins.html#twcrtins_wst">(1)</a>, <a href="topics/tcreate.html#tcreate_wst">(2)</a>
-</li>
-<li><a href="topics/tdebug.html#tdebug_wst">debugging applications</a>
-</li>
-<li><a href="topics/tdbgjsp.html#tdbgjsp_wst">debugging JSP files</a>
-</li>
-<li><a href="topics/tservlet.html#tservlet_wst">debugging servlets</a>
-</li>
-<li>deleting <a href="topics/twdelins.html#twdelins_wst">(1)</a>, <a href="topics/tcreate.html#tcreate_wst">(2)</a>
-</li>
-<li><a href="topics/tmetasrv.html#tmetasrv_wst">displaying metadata</a>
-</li>
-<li>editing <a href="topics/twedtins.html#twedtins_wst">(1)</a>, <a href="topics/tcreate.html#tcreate_wst">(2)</a>
-</li>
-<li><a href="topics/twedtins.html#twedtins_wst">editor</a>
-</li>
-<li><a href="topics/twlaunchpref.html#twlaunchpref_wst">launching preferences</a>
-</li>
-<li><a href="topics/twmanage.html#twmanage_wst">managing</a>
-</li>
-<li><a href="topics/rwrcview.html#rwrcview_wst">managing using the Servers view</a>
-</li>
-<li>preferences <a href="topics/tpref.html#tpref_wst">(1)</a>, <a href="topics/twsrvprf.html#twsrvprf_wst">(2)</a>
-</li>
-<li>publishing applications <a href="topics/tpublish.html#tpublish_wst">(1)</a>, <a href="topics/twpub.html#twpub_wst">(2)</a>
-</li>
-<li><a href="topics/twremprj.html#twremprj_wst">removing projects</a>
-</li>
-<li><a href="topics/twinstprf.html#twinstprf_wst">runtime environments</a>
-</li>
-<li><a href="topics/twprefin.html#twprefin_wst">setting project defaults</a>
-</li>
-<li><a href="topics/cwflow.html#cwflow_wst">starting</a>
-</li>
-<li><a href="topics/twsrtins.html#twsrtins_wst">starting for testing</a>
-</li>
-<li><a href="topics/twsrtdbg.html#twsrtdbg_wst">starting in debug mode</a>
-</li>
-<li><a href="topics/twstpins.html#twstpins_wst">stopping</a>
-</li>
-<li><a href="topics/rwtcpvw.html#rwtcpvw_wst">TCP/IP monitors</a>
-</li>
-<li>testing applications <a href="topics/cwres.html#cwres_wst">(1)</a>, <a href="topics/tj2ee.html#tj2ee_wst">(2)</a>
-</li>
-<li><a href="topics/testing.html#testing_wst">testing artifacts</a>
-</li>
-<li><a href="topics/cwover.html#cwover_wst">testing project resources</a>
-</li>
-</ul>
-</li>
-<li>servlets
-<ul class="indexlist">
-<li><a href="topics/tservlet.html#tservlet_wst">debugging on servers</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_54" href="#IDX0_54">T</a></strong>
-<ul class="indexlist">
-<li>TCP/IP
-<ul class="indexlist">
-<li><a href="topics/twtcpprf.html#twtcpprf_wst">preferences</a>
-</li>
-</ul>
-</li>
-<li>TCP/IP monitors
-<ul class="indexlist">
-<li><a href="topics/rwtcpvw.html#rwtcpvw_wst">overview</a>
-</li>
-</ul>
-</li>
-<li>threads
-<ul class="indexlist">
-<li><a href="topics/tservlet.html#tservlet_wst">suspending in servlets</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
-<ul class="indexlist">
-<li>views
-<ul class="indexlist">
-<li><a href="topics/twsrvprf.html#twsrvprf_wst">server preferences</a>
-</li>
-<li><a href="topics/rwrcview.html#rwrcview_wst">Servers</a>
-</li>
-<li><a href="topics/twtcpprf.html#twtcpprf_wst">TCP/IP Monitor preferences</a>
-</li>
-<li><a href="topics/rwtcpvw.html#rwtcpvw_wst">TCP/IP monitors</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_57" href="#IDX0_57">W</a></strong>
-<ul class="indexlist">
-<li>workbench
-<ul class="indexlist">
-<li><a href="topics/tmetasrv.html#tmetasrv_wst">displaying server metadata</a>
-</li>
-<li><a href="topics/tprefaud.html#tprefaud_wst">server audio preferences</a>
-</li>
-<li><a href="topics/twlaunchpref.html#twlaunchpref_wst">server launching preferences</a>
-</li>
-<li><a href="topics/twinstprf.html#twinstprf_wst">server runtime environments</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
index 5c0f851..e49a744 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -13,6 +13,7 @@
 <meta name="description" content="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." />
 <meta content="servers, starting" name="DC.subject" />
 <meta content="servers, starting" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twsrtins.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cwflow_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -64,6 +65,10 @@
 
 </div>
 
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/twsrtins.html" title="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.">Starting 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/cwres.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
index b1681ed..1544d31 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
@@ -13,6 +13,8 @@
 <meta name="description" content="To test and publish on your server, you need to define one or more of the following resources:" />
 <meta content="preferences, installed server runtime environments, runtime environments, description, servers, testing applications" name="DC.subject" />
 <meta content="preferences, installed server runtime environments, runtime environments, description, servers, testing applications" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tmetasrv.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twinstprf.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cwres_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -94,6 +96,11 @@
 
 </div>
 
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tmetasrv.html" title="On the workbench, you have the option to display or hide the metadata of the server.">Displaying or hiding the metadata of the server</a></div>
+<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>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
index 2da892b..5615cf8 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
@@ -300,7 +300,6 @@
 
 </div>
 
-<div />
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
index b889859..684da80 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html
@@ -13,6 +13,8 @@
 <meta name="description" content="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 TCPIP/IP Monitor preferences page ( Window &gt; Run/Debug &gt; TCP/IP Monitor)." />
 <meta content="servers, TCP/IP monitors, overview, views" name="DC.subject" />
 <meta content="servers, TCP/IP monitors, overview, views" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twtcpprf.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twtcpprf.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rwtcpvw_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -60,6 +62,10 @@
 
 </div>
 
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/twtcpprf.html" title="Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:">Defining the TCP/IP Monitor 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/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
index 8a331ec..fe8d512 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
@@ -82,7 +82,6 @@
 
 </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 204a8bd..b168b9b 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
@@ -119,7 +119,6 @@
 
 </div>
 
-<div />
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
index fd7ff71..635f3f3 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
@@ -4,49 +4,47 @@
  "task.dtd">

 <?Pub Inc?>

 <task id="twinstprf_wst" xml:lang="en-us">

-<title id="title">Defining the installed server runtime environments preferences</title>

+<title id="title">Defining the server runtime environments preferences</title>

 <shortdesc id="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>

 <prolog><metadata>

-<keywords id="index"><indexterm>preferences<indexterm>installed server runtime

-environments<indexterm>defining</indexterm></indexterm></indexterm><indexterm>servers<indexterm>runtime

-environment<indexterm>defining</indexterm></indexterm></indexterm><indexterm>runtime

-environment<indexterm>defining</indexterm></indexterm><indexterm>workbench<indexterm>defining

-server runtime environment</indexterm></indexterm><indexterm>wizards<indexterm>New

-Server Runtime</indexterm></indexterm><indexterm>applications<indexterm>defining

+<keywords id="index"><indexterm>preferences<indexterm>server runtime environments<indexterm>defining</indexterm></indexterm></indexterm>

+<indexterm>servers<indexterm>runtime environment<indexterm>defining</indexterm></indexterm></indexterm>

+<indexterm>runtime environment<indexterm>defining</indexterm></indexterm>

+<indexterm>workbench<indexterm>defining server runtime environment</indexterm></indexterm>

+<indexterm>wizards<indexterm>New Server Runtime</indexterm></indexterm><indexterm>applications<indexterm>defining

 server runtime environment</indexterm></indexterm><indexterm>New Server Runtime

-wizard</indexterm><indexterm>installed server runtime environments<indexterm>setting

+wizard</indexterm><indexterm>server runtime environments<indexterm>setting

 preferences</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

-<context id="context"><p>An <i>installed server runtime environment</i> is

-composed of the following definitions:  <ul>

-<li>a name to identify the installed server runtime environment</li>

+<context id="context"><p>A <i>server runtime environment</i> is composed of

+the following definitions:  <ul>

+<li>a name to identify the server runtime environment</li>

 <li>the type of server that specifies the vendor and version-level of the

 server</li>

 <li>the directory path to a local installation of the server</li>

 <li>in some cases, also includes a reference to a Java runtime environment</li>

-</ul>If an installed server runtime environment is referencing a stub directory

-of the server, you can only compile your application against the stub server.

- However, if referencing a full installation of the server, you can compile,

-test, and run your application against the installation of the server.</p>To

-define an installed server runtime environment, complete the following steps:</context>

+</ul>If a server runtime environment is referencing a stub directory of the

+server, you can only compile your application against the stub server.  However,

+if referencing a full installation of the server, you can compile, test, and

+run your application against the installation of the server.</p>To define

+a server runtime environment, complete the following steps:</context>

 <steps id="steps">

 <step><cmd>From the Window menu, select  <uicontrol>Preferences</uicontrol>.</cmd>

 </step>

 <step><cmd>In the Preferences window, expand the <uicontrol>Server</uicontrol> folder

-and then select  <uicontrol>Installed Runtimes</uicontrol>.</cmd><info>The

-Installed Server Runtime Environments section of the Preferences dialog is

-displayed.</info></step>

+and then select  <uicontrol>Runtime Environments</uicontrol>.</cmd><info>The

+Server Runtime Environments section of the Preferences dialog is displayed.</info>

+</step>

 <step><cmd importance="optional"><b>Optional: </b>Click the <uicontrol>Search</uicontrol> button.

-This searches your local directory for installed server runtime environments.

-Searching on a remote host is not supported.</cmd>

+This searches your local directory for server runtime environments. Searching

+on a remote host is not supported.</cmd>

 <substeps>

-<substep><cmd>The Search for Runtimes dialog box opens. In the <uicontrol>Folder</uicontrol> field,

+<substep><cmd>The Search for Runtime Environments dialog box opens. In the <uicontrol>Folder</uicontrol> field,

 browse or type the directory where you would like the workbench to start searching

-for installed server runtime environments. Click <uicontrol>OK</uicontrol>.</cmd>

-</substep>

+for server runtime environments. Click <uicontrol>OK</uicontrol>.</cmd></substep>

 <substep><cmd>If a list of installations is displayed, select the desired

 target server and click <uicontrol>OK</uicontrol> in the displayed dialog;

 then click <uicontrol>OK</uicontrol> in the Preferences dialog. If no installations

@@ -55,15 +53,14 @@
 </substeps>

 </step>

 <step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The New Server Runtime

-wizard opens.</info>

+Environments wizard opens.</info>

 <substeps>

-<substep><cmd><draft-comment>Modified this step</draft-comment>Under the <uicontrol>Select

-the runtime type</uicontrol> list, select a server and version level as the

-target installed server runtime environment.</cmd><info><note type="tip">In

-the text field under the <uicontrol>Select the runtime type</uicontrol> label,

-you can replace the text <userinput>type filter text</userinput> with keywords

-to filter the list of available application servers. The following are examples

-of filter keywords:<dl><dlentry>

+<substep><cmd>Under the <uicontrol>Select the type of runtime environment</uicontrol> list,

+select a server and version level as the target server runtime environment.</cmd>

+<info><note type="tip">In the text field under the <uicontrol>Select the type

+of runtime environment</uicontrol> label, you can replace the text <userinput>type

+filter text</userinput> with keywords to filter the list of available application

+servers. The following are examples of filter keywords:<dl><dlentry>

 <dt><userinput>Apache</userinput></dt>

 <dd>Filters the list of available servers where the vendor is Apache</dd>

 </dlentry><dlentry>

@@ -84,13 +81,13 @@
 <dd>Filters the list of available servers that supports J2EE 1.2 specification

 level or any servers that may have a version-level of 1.2.</dd>

 </dlentry></dl></note></info></substep>

-<substep><cmd>W<?Pub Caret1?>hen you add an installed server runtime environment,

-by default a server is created and added as an entry in the Servers view.

-If you want to only add the installed server runtime environment and not create

-the server in the Servers view, clear the <uicontrol>Create a new local server</uicontrol> check

-box.</cmd></substep>

-<substep><cmd>Click <uicontrol>Next</uicontrol>. The Runtime panel for the

-server is displayed.</cmd></substep>

+<substep><cmd>When you add a server runtime environment, by default a server

+is created and added as an entry in the Servers view. If you want to only

+add the server runtime environment and not create the server in the Servers

+view, clear the <uicontrol>Create a new local server</uicontrol> check box.</cmd>

+</substep>

+<substep><cmd>Click <uicontrol>Next</uicontrol>. A panel for the server is

+displayed.</cmd></substep>

 <substep><cmd>For <uicontrol>Installation directory</uicontrol> or <uicontrol>Location</uicontrol> field,

 type or browse to the location of the target server.</cmd><info><note type="tip">If

 you specify a false location for the target server, use the workbench to assemble

@@ -101,27 +98,25 @@
 tmtype="tm" trademark="Java">Java</tm> development kit installation.</info>

 </substep>

 <substep><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><info>The target server

-name and type is added to the table in the Installed Server Runtime Environment

-section.</info></substep>

+name and type is added to the table in the Server Runtime Environment section.</info>

+</substep>

 <substep><cmd>In the Preferences dialog, click <uicontrol>OK</uicontrol>.</cmd>

 </substep>

 </substeps>

 </step>

 </steps>

 <postreq id="postreq"><p id="postreq_p1">To change the list of available target

-servers, click <b>Window > Preferences > Server > Installed Runtimes</b> to

-go to the Installed Server Runtime Environments section of the Preferences

-dialog. Use the <b>Add</b>, <b>Edit</b>, <b>Remove</b> or <b>Search</b> options

-to change the list of target servers as needed.</p><p id="postreq_p2">To change

-the target server for a module:<ol>

+servers, click <b>Window > Preferences > Server > Runtime Environments</b> to

+go to the Server Runtime Environments section of the Preferences dialog. Use

+the <b>Add</b>, <b>Edit</b>, <b>Remove</b> or <b>Search</b> options to change

+the list of target servers as needed.</p><p id="postreq_p2">To change the

+target server for a module:<ol>

 <li>Right-click on the module in the Project Explorer view and click <b>Properties

 > Project Facets</b>. The Project Facets page opens.</li>

-<li><draft-comment>Gui changed from "Add/Remove Project Facets" to "Modify

-Faceted Project "</draft-comment>Select the <uicontrol>Modify Project</uicontrol> button.

-The Modify Faceted Project dialog box opens.</li>

-<li>Select the <uicontrol>Show Runtimes</uicontrol> button.</li>

-<li>Under the <b>Runtimes</b> table, select the target servers for the module.</li>

+<li>Select the <uicontrol>Runtimes</uicontrol> tab.</li>

+<li>Under the <b>Runtimes</b> table, select th<?Pub Caret?>e target servers

+for the module.</li>

 </ol> </p></postreq>

 </taskbody>

 </task>

-<?Pub *0000007340?>

+<?Pub *0000006969?>

diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
index dd4487e..f3fa085 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
@@ -8,21 +8,21 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining the installed server runtime environments preferences" />
+<meta name="DC.Title" content="Defining the server runtime environments preferences" />
 <meta name="abstract" content="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." />
 <meta name="description" content="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." />
-<meta content="preferences, installed server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, New Server Runtime wizard, installed server runtime environments, setting preferences" name="DC.subject" />
-<meta content="preferences, installed server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, New Server Runtime wizard, installed server runtime environments, setting preferences" name="keywords" />
+<meta content="preferences, server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, defining server runtime environment, New Server Runtime wizard, setting preferences" name="DC.subject" />
+<meta content="preferences, server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, defining server runtime environment, New Server Runtime wizard, setting preferences" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twinstprf_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining the installed server runtime environments preferences</title>
+<title>Defining the server runtime environments preferences</title>
 </head>
 <body id="twinstprf_wst"><a name="twinstprf_wst"><!-- --></a>
 
 
-<h1 class="topictitle1">Defining the installed server runtime environments preferences</h1>
+<h1 class="topictitle1">Defining the server runtime environments preferences</h1>
 
 
 
@@ -30,9 +30,9 @@
 to use a specific runtime environment of an application server for compiling,
 testing, or running your application.</p>
 
-<div class="section" id="twinstprf_wst__context"><a name="twinstprf_wst__context"><!-- --></a><div class="p">An <em>installed server runtime environment</em> is
-composed of the following definitions:  <ul>
-<li>a name to identify the installed server runtime environment</li>
+<div class="section" id="twinstprf_wst__context"><a name="twinstprf_wst__context"><!-- --></a><div class="p">A <em>server runtime environment</em> is composed of
+the following definitions:  <ul>
+<li>a name to identify the server runtime environment</li>
 
 <li>the type of server that specifies the vendor and version-level of the
 server</li>
@@ -42,30 +42,29 @@
 <li>in some cases, also includes a reference to a Java runtime environment</li>
 
 </ul>
-If an installed server runtime environment is referencing a stub directory
-of the server, you can only compile your application against the stub server.
- However, if referencing a full installation of the server, you can compile,
-test, and run your application against the installation of the server.</div>
-To
-define an installed server runtime environment, complete the following steps:</div>
+If a server runtime environment is referencing a stub directory of the
+server, you can only compile your application against the stub server.  However,
+if referencing a full installation of the server, you can compile, test, and
+run your application against the installation of the server.</div>
+To define
+a server runtime environment, complete the following steps:</div>
 
 <a name="twinstprf_wst__steps"><!-- --></a><ol id="twinstprf_wst__steps">
 <li class="stepexpand"><span>From the Window menu, select  <span class="uicontrol">Preferences</span>.</span>
 </li>
 
 <li class="stepexpand"><span>In the Preferences window, expand the <span class="uicontrol">Server</span> folder
-and then select  <span class="uicontrol">Installed Runtimes</span>.</span> The
-Installed Server Runtime Environments section of the Preferences dialog is
-displayed.</li>
+and then select  <span class="uicontrol">Runtime Environments</span>.</span> The
+Server Runtime Environments section of the Preferences dialog is displayed.
+</li>
 
 <li class="stepexpand"><span><strong>Optional: </strong>Click the <span class="uicontrol">Search</span> button.
-This searches your local directory for installed server runtime environments.
-Searching on a remote host is not supported.</span>
+This searches your local directory for server runtime environments. Searching
+on a remote host is not supported.</span>
 <ol type="a">
-<li><span>The Search for Runtimes dialog box opens. In the <span class="uicontrol">Folder</span> field,
+<li><span>The Search for Runtime Environments dialog box opens. In the <span class="uicontrol">Folder</span> field,
 browse or type the directory where you would like the workbench to start searching
-for installed server runtime environments. Click <span class="uicontrol">OK</span>.</span>
-</li>
+for server runtime environments. Click <span class="uicontrol">OK</span>.</span></li>
 
 <li><span>If a list of installations is displayed, select the desired
 target server and click <span class="uicontrol">OK</span> in the displayed dialog;
@@ -78,15 +77,14 @@
 </li>
 
 <li class="stepexpand"><span>Click <span class="uicontrol">Add</span>.</span> The New Server Runtime
-wizard opens.
+Environments wizard opens.
 <ol type="a">
-<li class="substepexpand"><span>Under the <span class="uicontrol">Select
-the runtime type</span> list, select a server and version level as the
-target installed server runtime environment.</span> <div class="tip"><span class="tiptitle">Tip:</span> In
-the text field under the <span class="uicontrol">Select the runtime type</span> label,
-you can replace the text <kbd class="userinput">type filter text</kbd> with keywords
-to filter the list of available application servers. The following are examples
-of filter keywords:<dl>
+<li class="substepexpand"><span>Under the <span class="uicontrol">Select the type of runtime environment</span> list,
+select a server and version level as the target server runtime environment.</span>
+ <div class="tip"><span class="tiptitle">Tip:</span> In the text field under the <span class="uicontrol">Select the type
+of runtime environment</span> label, you can replace the text <kbd class="userinput">type
+filter text</kbd> with keywords to filter the list of available application
+servers. The following are examples of filter keywords:<dl>
 <dt class="dlterm"><kbd class="userinput">Apache</kbd></dt>
 
 <dd>Filters the list of available servers where the vendor is Apache</dd>
@@ -122,14 +120,14 @@
 </div>
 </li>
 
-<li class="substepexpand"><span>When you add an installed server runtime environment,
-by default a server is created and added as an entry in the Servers view.
-If you want to only add the installed server runtime environment and not create
-the server in the Servers view, clear the <span class="uicontrol">Create a new local server</span> check
-box.</span></li>
+<li class="substepexpand"><span>When you add a server runtime environment, by default a server
+is created and added as an entry in the Servers view. If you want to only
+add the server runtime environment and not create the server in the Servers
+view, clear the <span class="uicontrol">Create a new local server</span> check box.</span>
+</li>
 
-<li class="substepexpand"><span>Click <span class="uicontrol">Next</span>. The Runtime panel for the
-server is displayed.</span></li>
+<li class="substepexpand"><span>Click <span class="uicontrol">Next</span>. A panel for the server is
+displayed.</span></li>
 
 <li class="substepexpand"><span>For <span class="uicontrol">Installation directory</span> or <span class="uicontrol">Location</span> field,
 type or browse to the location of the target server.</span> <div class="tip"><span class="tiptitle">Tip:</span> If
@@ -142,8 +140,8 @@
 </li>
 
 <li class="substepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The target server
-name and type is added to the table in the Installed Server Runtime Environment
-section.</li>
+name and type is added to the table in the Server Runtime Environment section.
+</li>
 
 <li class="substepexpand"><span>In the Preferences dialog, click <span class="uicontrol">OK</span>.</span>
 </li>
@@ -155,21 +153,19 @@
 </ol>
 
 <div class="section" id="twinstprf_wst__postreq"><a name="twinstprf_wst__postreq"><!-- --></a><p id="twinstprf_wst__postreq_p1"><a name="twinstprf_wst__postreq_p1"><!-- --></a>To change the list of available target
-servers, click <strong>Window &gt; Preferences &gt; Server &gt; Installed Runtimes</strong> to
-go to the Installed Server Runtime Environments section of the Preferences
-dialog. Use the <strong>Add</strong>, <strong>Edit</strong>, <strong>Remove</strong> or <strong>Search</strong> options
-to change the list of target servers as needed.</p>
-<div class="p" id="twinstprf_wst__postreq_p2"><a name="twinstprf_wst__postreq_p2"><!-- --></a>To change
-the target server for a module:<ol>
+servers, click <strong>Window &gt; Preferences &gt; Server &gt; Runtime Environments</strong> to
+go to the Server Runtime Environments section of the Preferences dialog. Use
+the <strong>Add</strong>, <strong>Edit</strong>, <strong>Remove</strong> or <strong>Search</strong> options to change
+the list of target servers as needed.</p>
+<div class="p" id="twinstprf_wst__postreq_p2"><a name="twinstprf_wst__postreq_p2"><!-- --></a>To change the
+target server for a module:<ol>
 <li>Right-click on the module in the Project Explorer view and click <strong>Properties
 &gt; Project Facets</strong>. The Project Facets page opens.</li>
 
-<li>Select the <span class="uicontrol">Modify Project</span> button.
-The Modify Faceted Project dialog box opens.</li>
+<li>Select the <span class="uicontrol">Runtimes</span> tab.</li>
 
-<li>Select the <span class="uicontrol">Show Runtimes</span> button.</li>
-
-<li>Under the <strong>Runtimes</strong> table, select the target servers for the module.</li>
+<li>Under the <strong>Runtimes</strong> table, select the target servers
+for the module.</li>
 
 </ol>
  </div>
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 e00baa2..6fe9bd6 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
@@ -13,6 +13,7 @@
 <meta name="description" content="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." />
 <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 content="XHTML" name="DC.Format" />
 <meta content="twpub_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -86,7 +87,10 @@
 
 </div>
 
-<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>
 
 </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 4d0e65d..f400e54 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
@@ -13,6 +13,7 @@
 <meta name="description" content="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." />
 <meta content="applications, starting servers for testing, projects, servers, starting for testing" name="DC.subject" />
 <meta content="applications, starting servers for testing, projects, servers, starting for testing" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwflow.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twsrtins_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -79,6 +80,10 @@
 
 </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>
 
 </body>
 </html>
\ No newline at end of file
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 0732c1b..4631e70 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
@@ -13,6 +13,7 @@
 <meta name="description" content="Using the Preferences page, you can define attribute used for testing projects by the servers." />
 <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 content="XHTML" name="DC.Format" />
 <meta content="twsrvprf_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -55,7 +56,10 @@
 
 </div>
 
-<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>
 
 </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 43164df..ba71161 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
@@ -13,6 +13,8 @@
 <meta name="description" content="Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:" />
 <meta content="preferences, TCP/IP Monitor, TCP/IP, views, TCP/IP Monitor" name="DC.subject" />
 <meta content="preferences, TCP/IP Monitor, TCP/IP, views, TCP/IP Monitor" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/rwtcpvw.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/rwtcpvw.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twtcpprf_wst" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -108,7 +110,10 @@
 
 </div>
 
-<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 TCPIP/IP Monitor preferences page ( Window &gt; Run/Debug &gt; TCP/IP Monitor).">TCP/IP Monitor view</a></div>
+</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file