[117966] Updated server docs for 1.0.1.
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
index 9cd1d76..ff6f80f 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.jst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
index 06d296b..d0ec1be 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
@@ -1,3 +1,2 @@
# NLS_MESSAGEFORMAT_VAR
-
-Plugin.name = Apache Tomcat for Server Tools documentation
+Plugin.name = Server Tools documentation for J2EE Standard Tools
\ No newline at end of file
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 3a6a099..56408ec 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
@@ -1,26 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<?eclipse version="3.0"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<!-- ================================================= -->
<!-- This is the plugin for declaring the help -->
-<!-- contributions for the Server Tools component -->
+<!-- contributions for the Server Tools component -->
<!-- ================================================= -->
<plugin>
<extension point="org.eclipse.help.toc">
- <toc file="build_toc.xml" />
- </extension>
+ <toc file="tomcat_create.xml" />
+ <toc file="tomcat_pref.xml" />
+</extension>
</plugin>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
new file mode 100644
index 0000000..ea16178
--- /dev/null
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_create" label="tomcat_tasks" topic="topics/tomcat.html">
+ <topic label="...Apache Tomcat" href="topics/tomcat.html"/>
+</toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
new file mode 100644
index 0000000..169b717
--- /dev/null
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc link_to="../org.eclipse.wst.server.ui.doc.user/wtp_create.xml#tomcat_pref" label="tomcat_tasks" topic="topics/twtomprf.html">
+ <topic label="...for Apache Tomcat runtimes" href="topics/twtomprf.html"/>
+</toc>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/InstallTomcat.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/InstallTomcat.html
deleted file mode 100644
index 056346e..0000000
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/InstallTomcat.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../book.css" type="text/css">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<title>Installing Apache Tomcat</title>
-</head>
-<body>
-<h1>Installing Apache Tomcat</h1>
-<p>
- In this tutorial, you will install an Apache Tomcat server
- using the Server Installed Runtimes preference page.
- </p>
-<h2>Installing server runtime</h2>
-<ol>
-
-<li>
- If you do not have Apache Tomcat on your machine, you
- will first need to download and unzip
- <a href="http://jakarta.apache.org/tomcat/">
- Apache Tomcat
- </a>. Multiple versions of Tomcat are supported. Select the version of Tomcat you would like to use for your application.
- </li>
-
-<li>
- Open
- <b>
- Window -> Preferences -> Server -> Installed
- Runtimes
- </b>
- to create a Tomcat installed runtime.
- </li>
-
-
-<li>
- Click on
- <b>Add...</b>
- to open the
- <b>New Server Runtime</b>
- dialog, then select your runtime under
- <b>Apache</b>:
-
-<br>
-
-<img border="0" src="images/InstallTomcat1.jpg">
- </li>
-
-
- <li>
- Click
- <b>Next</b>
- , and fill in your
- <b>Tomcat installation directory</b>
- :<br>
-
-<img border="0" src="images/InstallTomcat2.jpg">
- </li>
-
-
- <li>
- Ensure the selected
- <b>JRE</b>
- is a full JDK and is of a version that will satisfy
- Apache Tomcat. If you do not have a JDK installed you can install one be click on the
- <b>Installed JREs...</b> preference.
- </li>
-
-
-<li>
- Click
- <b>Finish</b>.
- </li>
- </ol>
-<p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
-</body>
-</html>
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 1f26842..af5c01c 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
@@ -1,11 +1,10 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,34 +13,33 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/ -->
-<link rel="stylesheet" href="../../org.eclipse.wst.doc.user/common.css" type="text/css"/>
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Creating a Tomcat server</title>
</head>
-<body id="tomcat"><a name="tomcat"><!-- --></a>
-
+<body onresize="location.reload();" id="tomcat_jst"><a name="tomcat_jst"><!-- --></a>
<h1 class="topictitle1">Creating a Tomcat server</h1>
-<div><p>The server tools feature supports the Apache Tomcat run-time environment,
+<div><div>The server tools feature supports the Apache Tomcat run-time 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: </p><div class="p"><b>Prerequisite</b><div class="p"><ul><li>Download Apache Tomcat from <a href="http://jakarta.apache.org/tomcat" target="_blank">jakarta.apache.org/tomcat</a></li>
+the following: </div><div class="p"><strong>Prerequisites</strong><div class="p"><ul><li>Download Apache Tomcat from <a href="http://jakarta.apache.org/tomcat" target="_blank">jakarta.apache.org/tomcat</a></li>
<li>Extract the compressed file containing Apache Tomcat on your local file
system.</li>
-<li><a href="twtomprf.html#twtomprf">Add the Apache Tomcat
-runtimes.</a></li>
+<li>Add the Apache Tomcat runtimes. For details on how to do this, refer to
+the <em>Add the Apache Tomcat runtimes</em> link on the bottom of this topic.</li>
</ul>
</div>
<p>To create a Apache Tomcat server:</p>
</div>
-<ol><li class="skipspace"><span>In the Servers view, right-click and select <span class="uicontrol">New</span> > <span class="uicontrol">Server</span>.
+<ol><li class="stepexpand"><span>In the Servers view, right-click and select <span class="uicontrol">New</span> > <span class="uicontrol">Server</span>.
The Define a New Server wizard opens.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Select the server type</span> list, select
-the Tomcat server defined in the previous step.</span> <div class="tip"><span class="tiptitle">Tip: </span>If
+<li class="stepexpand"><span>In the <span class="uicontrol">Select the server type</span> list, select
+the Tomcat server defined in the previous step.</span> <div class="tip"><span class="tiptitle">Tip:</span> If
you did not specify the Tomcat install directory, the Define a New Server
wizard will prompt you for this information.</div>
</li>
-<li class="skipspace"><span>Start the Tomcat server.</span> In the Servers view, right-click
+<li class="stepexpand"><span>Start the Tomcat server.</span> In the Servers view, right-click
the Tomcat server and select <span class="uicontrol">Start</span>.</li>
-<li class="skipspace"><span>Test your setup of the Tomcat server.</span><ol type="a"><li><span>Open a Web browser.</span></li>
+<li class="stepexpand"><span>Test your setup of the Tomcat server.</span><ol type="a"><li><span>Open a Web browser.</span></li>
<li><span>Type the Web address <samp class="codeph">http://localhost:8080/</samp>.
If you see the Apache Tomcat start page, you have successfully set up your
Tomcat server.</span></li>
@@ -49,8 +47,8 @@
</li>
</ol>
</div>
- <p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/twtomprf.html" title="Using the Preferences page, you can define the installed server runtime definitions for the Apache Tomcat server. To define these definitions, complete the following:">Adding the Apache Tomcat runtimes</a></div>
+</div>
</body>
</html>
\ No newline at end of file
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 6522fe5..02b4f5f 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
@@ -1,9 +1,8 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
@@ -17,31 +16,32 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Adding the Apache Tomcat runtimes</title>
</head>
-<body id="twtomprf"><a name="twtomprf"><!-- --></a>
-
+<body onresize="location.reload();" id="twtomprf_jst"><a name="twtomprf_jst"><!-- --></a>
<h1 class="topictitle1">Adding the Apache Tomcat runtimes</h1>
-<div><p>Using the Preferences page, you can define the installed server
-runtime definitions for the Apache Tomcat server. To define these definitions,
-complete the following: </p><ol><li class="skipspace"><span>From the Window menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li class="skipspace"><span>In the Preferences window, expand <span class="uicontrol">Server</span> and
+<div><div>Using the Preferences page, you can define the installed server
+runtime definitions for the Apache Tomcat server. To define these definitions,
+complete the following: </div><ol><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 <span class="uicontrol">Server</span> and
then select <span class="uicontrol">Installed Runtimes</span>.</span></li>
-<li class="skipspace"><span>On the Installed Server Runtime Environments page, click <span class="uicontrol">Add</span>.</span> The New Runtime wizard opens.</li>
-<li class="skipspace"><span>On the New Server Runtime page, expand <span class="uicontrol">Apache</span>.</span></li>
-<li class="skipspace"><span>Select one of the following supported Apache Tomcat servers:</span><ul><li>Apache Tomcat v3.2</li>
-<li>Apache Tomcat v4.0</li>
-<li>Apache Tomcat v4.1</li>
-<li>Apache Tomcat v5.0</li>
+<li class="stepexpand"><span>On the Installed Server Runtime Environments page, click <span class="uicontrol">Add</span>.</span> The New Runtime wizard opens.</li>
+<li class="stepexpand"><span>On the New Server Runtime page, expand <span class="uicontrol">Apache</span>.</span></li>
+<li class="stepexpand"><span>Select one of the following supported Apache Tomcat servers:</span><ul><li>Tomcat v3.2 Server</li>
+<li>Tomcat v4.0 Server</li>
+<li>Tomcat v4.1 Server</li>
+<li>Tomcat v5.0 Server</li>
+<li>Tomcat v5.5 Server</li>
</ul>
</li>
-<li class="skipspace"><span>The Tomcat Server page opens when you click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Tomcat installation directory</span> field,
-type or browse to the directory where you extracted the installation
-files of Apache Tomcat.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span></li>
+<li class="stepexpand"><span>The Tomcat Server page opens when you click <span class="uicontrol">Next</span>.</span></li>
+<li class="stepexpand"><span>In the <span class="uicontrol">Tomcat installation directory</span> field,
+type or browse to the directory where you extracted the installation files
+of Apache Tomcat.</span></li>
+<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
</ol>
</div>
- <p>
- (C) Copyright IBM Corporation 2000, 2005. All Rights Reserved.
- </p>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tomcat.html" title="The server tools feature supports the Apache Tomcat run-time 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>
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
index 8de5e90..211847d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.wst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build_toc.xml b/docs/org.eclipse.wst.server.ui.doc.user/build_toc.xml
deleted file mode 100644
index e934d7c..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/build_toc.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Testing and publishing applications" topic="topics/tdpub.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="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="Switching server configurations" href="topics/twaddsc.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build_toc2.xml b/docs/org.eclipse.wst.server.ui.doc.user/build_toc2.xml
deleted file mode 100644
index b990c75..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/build_toc2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<toc label="Testing and publishing applications">
- <topic label="Application testing and publishing" href="topics/tdbgjsp.html"/>
- <anchor id="st1"/>
- <topic label="Servers view" href="topics/tservlet.html"/>
- <topic label="Resources used by the Server Tools" href="topics/twcrtins.html"/>
- <topic label="Which test server will start" href="topics/twcrtins.html"/>
- <anchor id="st2"/>
- <topic label="Testing applications on a server" href="topics/twcrtins.html">
- <topic label="Testing artifacts on a server" href="topics/twcrtins.html"/>
- <anchor id="st3"/>
- <anchor id="st4"/>
- <anchor id="st5"/>
- </topic>
- <topic label="Publishing applications to a server" href="topics/twpub.html">
- <topic label="Publishing your application" href="topics/twpub.html"/>
- <anchor id="st6"/>
- <anchor id="st7"/>
- </topic>
- <topic label="Creating, editing, and deleting servers" href="topics/twpub.html">
- <topic label="Creating a server" href="topics/twcrtins.html"/>
- <anchor id="st8"/>
- <anchor id="st9"/>
- </topic>
- <topic label="Tomcat server" href="../org.eclipse.jst.server.ui.doc.user/tomcat_toc.xml"/>
- <topic label="Geronimo server" href="../org.eclipse.jst.server.ui.doc.user/geronimo_toc.xml"/>
- <topic label="Deleting a server" href="topics/twdelins.html"/>
- <topic label="Editing a server" href="topics/twedtins.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="Switching server configurations" href="topics/twaddsc.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/images/launch_profile.gif b/docs/org.eclipse.wst.server.ui.doc.user/images/launch_profile.gif
new file mode 100644
index 0000000..89c3340
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/images/launch_profile.gif
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/images/launch_run.gif b/docs/org.eclipse.wst.server.ui.doc.user/images/launch_run.gif
new file mode 100644
index 0000000..57f4102
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/images/launch_run.gif
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/images/scpview.gif b/docs/org.eclipse.wst.server.ui.doc.user/images/scpview.gif
new file mode 100644
index 0000000..d23f1f1
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/images/scpview.gif
Binary files differ
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
index 431bcb5..9f29ccc 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
@@ -1,3 +1,2 @@
-# NLS_MESSAGEFORMAT_VAR
-
-Plugin.name = Managing servers for Server Tools documentation
+# NLS_MESSAGEFORMAT_VAR
+Plugin.name = Server Tools documentation for Web Standard Tools
\ No newline at end of file
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 5d2e4f8..48e5ee5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
Binary files differ
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
new file mode 100644
index 0000000..f5f2eb3
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -0,0 +1,51 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Which server will start</title>
+</head>
+<body onresize="location.reload();" id="cwflow_wst"><a name="cwflow_wst"><!-- --></a>
+<h1 class="topictitle1">Which server will start</h1>
+<div><div><span id="cwflow_shortdesc_ph1"><a name="cwflow_shortdesc_ph1"><!-- --></a>A server can
+either be started manually or automatically. For example, it is automatically
+started when you right-click a project in the Project Explorer view and select <span class="menucascade"><span class="uicontrol">Run As</span> > <span class="uicontrol">Run on Server</span></span>.
+It is manually started when you click on the <strong>Start the server</strong></span> <img src="../images/launch_run.gif" alt="Picture of the Run on Server icon" onload="javascript:resizeimage(this);" name="../images/launch_run.gif" /> <span id="cwflow_shortdesc_ph2"><a name="cwflow_shortdesc_ph2"><!-- --></a>icon, the <strong>Start the server in debug mode</strong></span> <img src="../images/launch_debug.gif" alt="PIcture of the Debug on server Icon " onload="javascript:resizeimage(this);" name="../images/launch_debug.gif" /><span id="cwflow_shortdesc_ph3"><a name="cwflow_shortdesc_ph3"><!-- --></a> icon , or the <span class="uicontrol">Start the
+server in profiling mode</span></span> <img src="../images/launch_profile.gif" alt="" onload="javascript:resizeimage(this);" name="../images/launch_profile.gif" /><span id="cwflow_shortdesc_ph4"><a name="cwflow_shortdesc_ph4"><!-- --></a> icon, located in the Servers view.</span></div><p id="cwflow_wst__cwflow_p1"><a name="cwflow_wst__cwflow_p1"><!-- --></a>When you run a file or project, the server tools first verify
+that the servers and configurations for that particular resource are already
+set up and determines how many are defined. You are then prompted by the Run
+on Server dialog box to select a server. </p>
+<div class="section" id="cwflow_wst__cwflow_section1"><a name="cwflow_wst__cwflow_section1"><!-- --></a><h4 class="sectiontitle">Run on Server</h4><p>If this is the
+first time you are testing a file or project, you will be prompted to create
+a new server. The Run on Server dialog box presents you with two options for
+deciding which server to run:</p>
+<ul><li> <span class="uicontrol">Choose an existing server</span> This list includes servers
+that may or may not have already been configured. If you choose a server that
+is not already configured, it will be configured automatically and may be
+restarted if the server is already running.</li>
+<li> <span class="uicontrol">Manually define a server</span> This option will create
+a new server and server configuration before testing.</li>
+</ul>
+<p>If this is the first time you are testing a file or project, <span class="uicontrol">Manually
+define a server</span> is selected for you by default. When you select
+the type of server and click <span class="uicontrol">Next</span>, a server will be
+automatically created for you and the server will start.</p>
+</div>
+</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/cwover.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
new file mode 100644
index 0000000..61f279c
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
@@ -0,0 +1,44 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Testing and publishing on your server</title>
+</head>
+<body onresize="location.reload();" id="cwover_wst"><a name="cwover_wst"><!-- --></a>
+<h1 class="topictitle1">Testing and publishing on your server</h1>
+<div><div><span id="cwover_shortdesc_ph1"><a name="cwover_shortdesc_ph1"><!-- --></a>The testing
+and publishing tools provides runtime environments where you can test JSP
+files, servlets, HTML files,</span> <span id="cwover_shortdesc_ph2"><a name="cwover_shortdesc_ph2"><!-- --></a>and Java classes.</span></div><p id="cwover_wst__cwover_p1"><a name="cwover_wst__cwover_p1"><!-- --></a>You can use the workbench to test and publish resources
+from the following types of projects:</p>
+<a name="cwover_wst__cwover_ul1"><!-- --></a><ul id="cwover_wst__cwover_ul1"><li>Dynamic Web projects, which typically contain JSP files, HTML files, servlets,
+and beans</li>
+<li>Static Web projects, which typically contain HTML files and graphic files</li>
+<li>Enterprise Application projects, which may contain Java Archive
+(JAR) files or Web Archive (WAR) files or both, and pointers to other Web
+or EJB projects</li>
+<li>EJB projects, which contain enterprise beans</li>
+<li>Application client projects</li>
+</ul>
+<p id="cwover_wst__cwover_p2"><a name="cwover_wst__cwover_p2"><!-- --></a>After testing your application locally, you can use the
+tools to publish the application.</p>
+<div class="section" id="cwover_wst__cwover_server_definitions"><a name="cwover_wst__cwover_server_definitions"><!-- --></a><h4 class="sectiontitle">Server definitions</h4><p>The
+server tools use <var class="varname">servers</var> to test and publish your projects.
+Servers are definitions that identify where you want to test your projects.
+You can either have the development environment create the servers automatically
+for you, or you can create them using a wizard.</p>
+</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
new file mode 100644
index 0000000..321eee1
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
@@ -0,0 +1,83 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Resources used to test and publish on your server</title>
+</head>
+<body onresize="location.reload();" id="cwres_wst"><a name="cwres_wst"><!-- --></a>
+<h1 class="topictitle1">Resources used to test and publish on your server</h1>
+<div><div>To test and publish on your server, you need
+to define one or more of the following resources:</div><a name="cwres_wst__cwres_ul"><!-- --></a><ul id="cwres_wst__cwres_ul"><li>A server</li>
+<li>An installed server runtime environment</li>
+</ul>
+<p id="cwres_wst__cwres_p1"><a name="cwres_wst__cwres_p1"><!-- --></a>If a server has server configuration files, in most situations,
+these server configuration files are created for you automatically and contained
+in a server project.</p>
+<div class="section" id="cwres_wst__cwres_server_project"><a name="cwres_wst__cwres_server_project"><!-- --></a><h4 class="sectiontitle">Server Project</h4><p>A <em>server
+project</em> contains servers and server configuration files. When a server
+project is created automatically by the workbench, the name given to the project
+is <span class="uicontrol">Servers</span> and is available in the Project Explorer
+view under the Other Projects folder.</p>
+</div>
+<div class="section" id="cwres_wst__cwres_servers"><a name="cwres_wst__cwres_servers"><!-- --></a><h4 class="sectiontitle">Servers</h4><p id="cwres_wst__cwres_servers_p1"><a name="cwres_wst__cwres_servers_p1"><!-- --></a>A <em>server</em> identifies where you want to test or
+publish your application. A server points to a specific runtime environment
+such as a local test environment, a full installation of a server, or a server
+on another machine. A server contains the logic of how to publish to the server;
+and what application projects and configurations to run.</p>
+<p id="cwres_wst__cwres_servers_p2"><a name="cwres_wst__cwres_servers_p2"><!-- --></a>On
+the workbench, when the metadata of the server is automatically created, it
+is stored in a <em>serverName</em>.server file, where <em>serverName</em> is the
+name assigned to the server. For details on the metadata of the server, refer
+to the <em>Displaying or hiding the metadata of the server</em> link at the
+bottom of this topic.</p>
+</div>
+<div class="section"><h4 class="sectiontitle">Server configurations</h4><p id="cwres_wst__cwres_serverconfig_p1"><a name="cwres_wst__cwres_serverconfig_p1"><!-- --></a><span>Server configurations are files that contains
+information that is required to set up and publish to a server. For example,
+these files may include information about what port to run the server, security
+preferences and other vendor-specific server settings.</span></p>
+<p id="cwres_wst__cwres_serverconfig_p2"><a name="cwres_wst__cwres_serverconfig_p2"><!-- --></a>On
+the workbench, the metadata of the server configurations is automatically
+created and stored in a <em>configuration data folder</em> under a server project.
+The naming convention of the configuration data folder is dependant on the
+vendor, typically it has the following convention: <em>serverName</em>@<em>hostname</em>-config,
+where <em>serverName</em> is the name assigned to the server, and <em>hostname</em> is
+the fully qualified DNS name or IP address of the host machine where the server
+is running.</p>
+</div>
+<div class="section" id="cwres_wst__cwres_installed_runtime"><a name="cwres_wst__cwres_installed_runtime"><!-- --></a><h4 class="sectiontitle">Installed Server Runtime Environment</h4>You
+need to define the runtime environment of an application server for compiling
+your application. A server contains a reference to an installed server runtime
+environment it is currently using. For details on how to define an installed
+server runtime environment, refer to the <em>Defining the installed server
+runtime environments</em> link at the bottom of this topic.</div>
+<div class="section" id="cwres_wst__cwres_relationship"><a name="cwres_wst__cwres_relationship"><!-- --></a><h4 class="sectiontitle">Relationship between the resources</h4><p>For
+each server, you can specify the server configuration and installed server
+runtime environment that should be used for that server. A server can only
+point to one or no server configuration. However, a server configuration can
+be pointed to from one or more servers.</p>
+<p>A relationship between a server
+configuration and an application project, for example an EAR project, is created
+when a project is added to the server configuration. A server can point to
+one or more projects. A project can be pointed to from one or more server
+configurations.</p>
+</div>
+</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 your application. You can complete this by defining the installation directory of the server:">Defining the installed server runtime environments</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
new file mode 100644
index 0000000..f796321
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
@@ -0,0 +1,97 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Servers view</title>
+</head>
+<body onresize="location.reload();" id="rwrcview_wst"><a name="rwrcview_wst"><!-- --></a>
+<h1 class="topictitle1">Servers view</h1>
+<div><div>The Servers view (similar to the one shown
+below) allows you to manage the servers. This view displays a list of all
+your servers and configurations that are associated with that server. You
+can use this view to start, start in debug mode, restart, or stop the servers.</div><div class="section"><p> <img src="../images/scpview.gif" alt="Picture of Server view" onload="javascript:resizeimage(this);" name="../images/scpview.gif" /> </p>
+<p id="rwrcview_wst__rwrcview_p2"><a name="rwrcview_wst__rwrcview_p2"><!-- --></a>Use the Servers view to perform the following
+tasks:</p>
+<ul><li id="rwrcview_wst__rwrcview_li1"><a name="rwrcview_wst__rwrcview_li1"><!-- --></a>Create a server</li>
+<li id="rwrcview_wst__rwrcview_li2"><a name="rwrcview_wst__rwrcview_li2"><!-- --></a>Edit a server</li>
+<li id="rwrcview_wst__rwrcview_li3"><a name="rwrcview_wst__rwrcview_li3"><!-- --></a>Delete a server</li>
+<li id="rwrcview_wst__rwrcview_li4"><a name="rwrcview_wst__rwrcview_li4"><!-- --></a>Start a server in debug mode</li>
+<li id="rwrcview_wst__rwrcview_li5"><a name="rwrcview_wst__rwrcview_li5"><!-- --></a>Start a server </li>
+<li id="rwrcview_wst__rwrcview_li6"><a name="rwrcview_wst__rwrcview_li6"><!-- --></a>Restart a server in debug mode</li>
+<li id="rwrcview_wst__rwrcview_li7"><a name="rwrcview_wst__rwrcview_li7"><!-- --></a>Restart a server</li>
+<li id="rwrcview_wst__rwrcview_li8"><a name="rwrcview_wst__rwrcview_li8"><!-- --></a>Stop a server</li>
+<li id="rwrcview_wst__rwrcview_li10"><a name="rwrcview_wst__rwrcview_li10"><!-- --></a>Publish your application</li>
+<li id="rwrcview_wst__rwrcview_li11"><a name="rwrcview_wst__rwrcview_li11"><!-- --></a>Monitor server ports</li>
+<li id="rwrcview_wst__rwrcview_li11b"><a name="rwrcview_wst__rwrcview_li11b"><!-- --></a>Displaying or hiding the metadata of the server from
+the workbench</li>
+<li id="rwrcview_wst__rwrcview_li12"><a name="rwrcview_wst__rwrcview_li12"><!-- --></a>Add and remove projects from a server</li>
+</ul>
+<p id="rwrcview_wst__rwrcview_p3"><a name="rwrcview_wst__rwrcview_p3"><!-- --></a>The Servers view displays the current status of all
+the servers. The <strong>Status</strong> column indicates whether or not a server has
+been started. The following lists the possible server status:</p>
+<ul><li id="rwrcview_wst__rwrcview_ul2li1"><a name="rwrcview_wst__rwrcview_ul2li1"><!-- --></a>Starting</li>
+<li id="rwrcview_wst__rwrcview_ul2li2"><a name="rwrcview_wst__rwrcview_ul2li2"><!-- --></a>Started</li>
+<li id="rwrcview_wst__rwrcview_ul2li3"><a name="rwrcview_wst__rwrcview_ul2li3"><!-- --></a>Debugging</li>
+<li id="rwrcview_wst__rwrcview_ul2li4"><a name="rwrcview_wst__rwrcview_ul2li4"><!-- --></a>Stopping</li>
+<li id="rwrcview_wst__rwrcview_ul2li5"><a name="rwrcview_wst__rwrcview_ul2li5"><!-- --></a>Stopped</li>
+</ul>
+<div class="tip" id="rwrcview_wst__rwrcview_note"><a name="rwrcview_wst__rwrcview_note"><!-- --></a><span class="tiptitle">Tip:</span> When the Servers view is first opened
+after restarting a workbench session, the status of a server might be missing.
+To update the status of the server, right-click on the server in the Servers
+view and select <span class="uicontrol">Refresh Status</span> from the pop-up menu.</div>
+<p id="rwrcview_wst__rwrcview_p4"><a name="rwrcview_wst__rwrcview_p4"><!-- --></a>The Servers view also displays the current state of all the
+servers. Depending on the status of the server and the preference options
+that are selected for that particular server, the workbench determines the
+server actions that may be taken. Use the <strong>State</strong> column as an indicator
+for possible actions that you may want to take. For example, if the workbench
+detects that a file defined to run on a particular server has
+changed, and the <span class="uicontrol">Automatically restart servers when necessary</span> check
+box has been selected on the Server preferences page ( <span class="uicontrol">Window >
+Preferences > Server</span>), the server tools automatically restart
+that server. The <span class="uicontrol">Status</span> column in the Servers view
+changes from <var class="varname">Started</var> to <var class="varname">Stopped</var> to
+ <var class="varname">Started</var>. However, if this check box is not selected, the
+ <span class="uicontrol">State</span> column in the Servers view changes to <var class="varname">Republish</var>.</p>
+<p id="rwrcview_wst__rwrcview_p5"><a name="rwrcview_wst__rwrcview_p5"><!-- --></a>The following table lists the possible server states:</p>
+
+<div class="tablenoborder"><a name="rwrcview_wst__rwrcview_table"><!-- --></a><table cellpadding="4" cellspacing="0" summary="" id="rwrcview_wst__rwrcview_table" frame="border" border="1" rules="all"><caption>Table 1. Description of server states</caption><thead align="left"><tr><th valign="top" id="d0e101"> Server states </th>
+<th valign="top" id="d0e103"> Description of states </th>
+</tr>
+</thead>
+<tbody><tr><td valign="top" headers="d0e101 ">Synchronized</td>
+<td valign="top" headers="d0e103 ">Both the server and the applications are in synch.</td>
+</tr>
+<tr><td valign="top" headers="d0e101 ">Publishing</td>
+<td valign="top" headers="d0e103 ">Files (projects, resource files, and server configurations)
+are copied to the correct location for the server to find and use them.</td>
+</tr>
+<tr><td valign="top" headers="d0e101 ">Restart</td>
+<td valign="top" headers="d0e103 ">The server needs to be restarted in order for the changes to take place.</td>
+</tr>
+<tr><td valign="top" headers="d0e101 ">Republish</td>
+<td valign="top" headers="d0e103 "> Either the server or the applications or both have changed. The changed
+files need to be republished.</td>
+</tr>
+<tr><td valign="top" headers="d0e101 ">Restart and republish</td>
+<td valign="top" headers="d0e103 "> Either the server or the applications or both have changed. When the
+server is restarted, the changed files are also republished.</td>
+</tr>
+</tbody>
+</table>
+</div>
+</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 ad9db87..f6db1a4 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,17 +16,17 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>TCP/IP Monitor view</title>
</head>
-<body id="rwtcpvw"><a name="rwtcpvw"><!-- --></a>
+<body onresize="location.reload();" id="rwtcpvw_wst"><a name="rwtcpvw_wst"><!-- --></a>
<h1 class="topictitle1">TCP/IP Monitor view</h1>
-<div><p>The TCP/IP Monitor is a simple server that monitors all the requests
+<div><div>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 <span class="uicontrol">Show
-TCP/IP Monitor view when there is activity</span> check box on the TCP/IP
-Monitor preferences page ( <span class="uicontrol">Window > Preferences > Internet > TCP/IP
-Monitor</span>).</p><div class="section"><p>You can monitor the TCP/IP activity using the TCP/IP Monitor view
-(<b>Windows Show View > Other > Debug > TCP/IP Monitor</b>).
-This view consists of the three panes:</p>
+TCP/IP Monitor view when there is activity</span> check box on the TCPIP/IP
+Monitor preferences page ( <span class="menucascade"><span class="uicontrol">Window </span> > <span class="uicontrol">Run/Debug</span> > <span class="uicontrol">TCP/IP Monitor</span></span>).</div><div class="section"><p>You can monitor the TCP/IP activity using the TCP/IP Monitor view
+(<span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Show View</span> > <span class="uicontrol">Other</span> > <span class="uicontrol">Debug</span> > <span class="uicontrol">TCP/IP
+Monitor</span></span>). This view consists of the
+three panes:</p>
<ul><li>List of Requests pane. Located on the top of the TCP/IP Monitor view,
this pane contains a list of requests sent to the application server.</li>
<li>Request pane. Located on the left of the TCP/IP Monitor view, this pane
@@ -44,8 +44,12 @@
is forwarded from the server.</p>
</div>
</div>
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="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 preference</a></div>
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <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 preference</a></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 preference</a></div>
</div>
</div>
</body>
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
new file mode 100644
index 0000000..9836a2d
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
@@ -0,0 +1,36 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Creating, editing, and deleting servers</title>
+</head>
+<body onresize="location.reload();" id="tcreate_wst"><a name="tcreate_wst"><!-- --></a>
+<h1 class="topictitle1">Creating, editing, and deleting servers</h1>
+<div><div></div></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.</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 3267432..43577a8 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,55 +16,41 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Debugging a JSP file on a server</title>
</head>
-<body id="tdbgjsp"><a name="tdbgjsp"><!-- --></a>
+<body onresize="location.reload();" id="tdbgjsp_wst"><a name="tdbgjsp_wst"><!-- --></a>
+<script type="text/javascript">
+ if (navigator.appName=="Netscape") {
+ setTimeout('window.onresize = reload',500);
+ }
+ </script>
<h1 class="topictitle1">Debugging a JSP file on a server</h1>
-<div><p>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. </p><div class="skipspace">To debug a JSP file on a server:</div>
-<ol><li class="skipspace"><span>In the Project Explorer view, open your JSP file.</span> In
-
-a Web project, JSP files are located in the Web Content folder. Double-click
-
-the JSP file to open it on the JSP editor.</li>
-<li>To set one or more breakpoints, you can select a line of code in the editor and double-click the marker
-
-bar directly to the left of the line where you want to add the breakpoint.
-</li>
-<li class="skipspace"><span>From the JSP file's context menu in the Project Explorer view,
-
-click <span class="uicontrol">Debug As > Debug on Server.</span> The workbench switches
-
-to the Debug perspective and the server is launched in debug mode.</span></li>
-<li class="skipspace"><span>In the Debug view, step through the code and make the necessary
-
-changes to the JSP file.</span> For detailed information on debugging,
-
-refer to the Debugging Java™ applications documentation.</li>
-<li class="skipspace"><span>Save the JSP file.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Refresh</span> icon in the Web Browser
-
-to update the changes.</span> The state of your application is not lost
-
-and the server recognizes your changes.</li>
+<div><div>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. </div><div class="section" id="tdbgjsp_wst__tdbgjsp_context"><a name="tdbgjsp_wst__tdbgjsp_context"><!-- --></a>To debug a JSP file on a server:</div>
+<ol><li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step1"><a name="tdbgjsp_wst__tdbgjsp_step1"><!-- --></a><span>In the Project Explorer view, open your JSP
+file.</span> In a Web project, JSP files are located in the Web Content
+folder. Double-click the JSP file, the file opens in an editor.</li>
+<li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step2"><a name="tdbgjsp_wst__tdbgjsp_step2"><!-- --></a><span>To set one or more breakpoints, you can select
+a line of code in the editor and double-click the marker bar directly to the
+left of the line where you want to add the breakpoint.</span></li>
+<li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step3"><a name="tdbgjsp_wst__tdbgjsp_step3"><!-- --></a><span>From the JSP file's context menu in the Project
+Explorer view, click <span class="uicontrol">Debug > Debug on Server.</span> The
+workbench switches to the Debug perspective and the server is launched in
+debug mode.</span></li>
+<li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step4"><a name="tdbgjsp_wst__tdbgjsp_step4"><!-- --></a><span>In the Debug view, step through the code and
+make the necessary changes to the JSP file.</span> For detailed information
+on debugging, refer to the Debugging Java applications documentation.</li>
+<li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step5"><a name="tdbgjsp_wst__tdbgjsp_step5"><!-- --></a><span>Save the JSP file.</span></li>
+<li class="stepexpand" id="tdbgjsp_wst__tdbgjsp_step6"><a name="tdbgjsp_wst__tdbgjsp_step6"><!-- --></a><span>Click the <span class="uicontrol">Refresh</span> icon
+in the Web Browser to update the changes.</span> The state of your application
+is not lost and the server recognizes your changes.</li>
</ol>
-<div class="skipspace"><div class="note"><span class="notetitle">Note: </span><ul><li>If you are running the JSP file on a remote WebSphere<sup>®</sup> server,
-
-the JSP cache directory must be cleared in order to force the class file to
-
-be in the correct JSP source debug mode. If the cache is not cleared, some
-
-compiled unchanged JSP files may still be compiled in the previous JSP source
-
-debug mode.</li>
-</ul>
</div>
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdebug.html" title="">Debugging applications on a server</a></div>
</div>
</div>
</body>
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 1bfe6f8..8f7bc07 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,9 +16,25 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Debugging applications on a server</title>
</head>
-<body id="tdebug"><a name="tdebug"><!-- --></a>
+<body onresize="location.reload();" id="tdebug_wst"><a name="tdebug_wst"><!-- --></a>
<h1 class="topictitle1">Debugging applications on a server</h1>
-<div><p></p></div>
+<div><div></div></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>
+</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
new file mode 100644
index 0000000..17b4737
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
@@ -0,0 +1,79 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Testing artifacts on a server</title>
+</head>
+<body onresize="location.reload();" id="testing_wst"><a name="testing_wst"><!-- --></a>
+<h1 class="topictitle1">Testing artifacts on a server</h1>
+<div><div>You can use the workbench to test one or
+more application artifacts on a server.</div><div class="p"></div>
+<div class="section"></div>
+<ol><li class="stepexpand" id="testing_wst__testing_step1"><a name="testing_wst__testing_step1"><!-- --></a><span>In the Project Explorer view from the J2EE perspective,
+expand the project that contains the file you want to test.</span></li>
+<li class="stepexpand" id="testing_wst__testing_step2"><a name="testing_wst__testing_step2"><!-- --></a><span>Right-click the artifact that you want to test.</span> Examples of artifacts include the Web project or a file within the Web
+project (such as a JSP file, servlet, or HTML file), or an enterprise bean.</li>
+<li class="stepexpand" id="testing_wst__testing_step3"><a name="testing_wst__testing_step3"><!-- --></a><span>Select <span class="uicontrol">Run As > Run on Server</span>.
+The Server selection wizard appears.</span></li>
+<li class="stepexpand" id="testing_wst__testing_step4"><a name="testing_wst__testing_step4"><!-- --></a><span>Use the radio buttons to specify how you want
+to select the server. Select from the following options:</span>
+<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
+<thead><tr><th id="d0e29-option" valign="bottom" align="left">Option</th>
+<th id="d0e29-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e29-option" id="d0e31"><strong>Choose an existing server</strong></td>
+<td valign="top" headers="d0e29-desc d0e31">This option uses
+an existing server that is defined in your workbench. </td>
+</tr>
+<tr><td valign="top" headers="d0e29-option" id="d0e36"><strong>Manually define a server</strong></td>
+<td valign="top" headers="d0e29-desc d0e36">This option creates
+a new server.</td>
+</tr>
+</tbody></table>
+</li>
+<li class="stepexpand" id="testing_wst__testing_step5"><a name="testing_wst__testing_step5"><!-- --></a><span>Under the <span class="uicontrol">Select the server that
+you want to use</span> list, select a server you want to run your application.</span> The list of available servers, under the <span class="uicontrol">Select the server
+that you want to use</span> list, depends on the J2EE specification level
+you defined for the artifact and the supported servers on this workbench.</li>
+<li class="stepexpand" id="testing_wst__testing_step6"><a name="testing_wst__testing_step6"><!-- --></a><span>(Optional) Click <span class="uicontrol">Next</span> to
+configure additional settings, such as configuring settings specific to the
+server, and adding or removing projects configured on the server.</span></li>
+<li class="stepexpand"><span><span id="testing_wst__testing_step7_ph1"><a name="testing_wst__testing_step7_ph1"><!-- --></a>Click <span class="uicontrol">Finish.</span></span></span> <span id="testing_wst__testing_step7_ph2"><a name="testing_wst__testing_step7_ph2"><!-- --></a>The server tools automatically complete the
+following tasks for you: </span><ul><li id="testing_wst__testing_li1"><a name="testing_wst__testing_li1"><!-- --></a>If this is the first time you are creating the server
+on the workspace and if the server generates server configuration files, the
+workbench creates a server project with <span class="uicontrol">Servers</span> as
+the default name to hold the generated server configuration files.</li>
+<li id="testing_wst__testing_li2"><a name="testing_wst__testing_li2"><!-- --></a>Creates the server and adds it to the Servers View.</li>
+<li id="testing_wst__testing_li3"><a name="testing_wst__testing_li3"><!-- --></a>Adds your project to the server.</li>
+<li id="testing_wst__testing_li4"><a name="testing_wst__testing_li4"><!-- --></a>Starts the server. (This may take time depending on the
+server settings.)</li>
+<li id="testing_wst__testing_li5"><a name="testing_wst__testing_li5"><!-- --></a>If the <span class="uicontrol">Automatically publish before starting
+servers</span> check box on the Server preferences page (<span class="menucascade"><span class="uicontrol">Window > Preferences > Server</span></span>) is selected,
+the workbench checks to see if your project and files on the server are synchronized.
+If they are not, the project and the files are automatically updated when
+the server is restarted.</li>
+<li id="testing_wst__testing_li6"><a name="testing_wst__testing_li6"><!-- --></a>Depending on the artifact you are testing, the output
+of running your artifact may display in the Console view or in a Web browser
+that automatically opens.</li>
+</ul>
+</li>
+</ol>
+</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
new file mode 100644
index 0000000..dc0d613
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
@@ -0,0 +1,30 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Testing applications on a server</title>
+</head>
+<body onresize="location.reload();" id="tj2ee_wst"><a name="tj2ee_wst"><!-- --></a>
+<h1 class="topictitle1">Testing applications on a server</h1>
+<div><div>You can use the workbench to test one or more projects on a server. </div></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>
+</ul>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html
new file mode 100644
index 0000000..01101bd
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html
@@ -0,0 +1,25 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Limitations and restrictions</title>
+</head>
+<body onresize="location.reload();" id="tlimits_wst"><a name="tlimits_wst"><!-- --></a>
+<h1 class="topictitle1">Limitations and restrictions</h1>
+<div><div>This section describes known server tools limitations and problems
+along with their solutions.</div><div class="section"></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
new file mode 100644
index 0000000..e41b2af
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
@@ -0,0 +1,68 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Displaying or hiding the metadata of the server</title>
+</head>
+<body onresize="location.reload();" id="tmetasrv_wst"><a name="tmetasrv_wst"><!-- --></a>
+<h1 class="topictitle1">Displaying or hiding the metadata of the server</h1>
+<div><div>On the workbench, you have the option to display or hide the metadata
+of the server.</div><div class="section"><div class="p">The <em>metadata</em> contains a variety of information about the
+server such as:<ul><li>The location where the server configuration files are stored on the workbench.</li>
+<li>The fully qualified DNS name or IP address of the host machine where the
+server is running.</li>
+<li>The name assign to the server.</li>
+<li>The name of the installed server runtime environment which defines the
+runtime environment of an application server for compiling your application.</li>
+</ul>
+</div>
+<p>By default, the tool hides the metadata of the server to keep
+the development workspace clean. Displaying the metadata of the server on
+the workbench, allows you to persists the data of the server in a <em>serverName</em>.server
+file, where <em>serverName</em> is the name assigned to the server. The <em>serverName</em>.server
+file is useful when you are working in a team development environment and
+you are required to maintain the metadata of the server in a source control
+repository.</p>
+To display the metadata of the server:</div>
+<ol><li class="stepexpand"><span>In the Servers view, right-click the server you want to display
+the metadata.</span></li>
+<li class="stepexpand"><span>Select the <span class="uicontrol">Move to Workspace</span> option.</span> <div class="tip"><span class="tiptitle">Tip:</span> If the <span class="uicontrol">Move to Workspace</span> option
+is not available and you only see the <span class="uicontrol">Move to Metadata</span> option,
+this means the metadata of your server is already on the workbench. The next
+step describes where you can find it on the workbench.</div>
+</li>
+<li class="stepexpand"><span>In the Project Explorer view, expand the <strong>Others Project</strong> folder
+and then expand your server project to locate the <em>serverName</em>.server
+file, where <em>serverName</em> is the name assigned to your server.</span></li>
+<li class="stepexpand"><span>(<strong>Optional</strong>) You can double click <em>serverName</em>.server
+file to edit the server's data in the server editor.</span></li>
+</ol>
+<div class="section">To hide the metadata of the server:<div class="p"><ol><li>In the Servers view, right-click the server you want to hide the metadata.</li>
+<li>Select the <span class="uicontrol">Move to Metadata</span> option.<div class="tip"><span class="tiptitle">Tip:</span> If
+the <span class="uicontrol">Move to Metadata</span> option is not available and you
+only see the <span class="uicontrol">Move to Workspace</span> option, this means the
+metadata of your server is already hidden from the workbench.</div>
+</li>
+</ol>
+</div>
+</div>
+</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/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
new file mode 100644
index 0000000..c534e19
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
@@ -0,0 +1,42 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Defining server preferences</title>
+</head>
+<body onresize="location.reload();" id="tpref_wst"><a name="tpref_wst"><!-- --></a>
+<h1 class="topictitle1">Defining server preferences</h1>
+<div><div>The server tools allow you to define the following
+preferences:</div></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 attributes used for
+testing projects by the servers. To define these preferences, do the following:</li>
+<li class="ulchildlink"><strong><a href="../topics/tprefaud.html">Defining the audio preference</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/twtcpprf.html">Defining the TCP/IP Monitor preference</a></strong><br />
+Using the Preferences page, you can define the TCP/IP Monitor attributes. To
+define these preferences, complete the following:</li>
+<li class="ulchildlink"><strong><a href="../topics/twinstprf.html">Defining the installed server runtime environments</a></strong><br />
+Using the Preferences page, you can direct the workbench to use
+a specific runtime environment of an application server for compiling your
+application. You can complete this by defining the installation directory
+of 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/tprefaud.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html
index 22e2496..d2548ef 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,29 +16,28 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Defining the audio preference</title>
</head>
-<body id="tprefaud"><a name="tprefaud"><!-- --></a>
-
+<body onresize="location.reload();" id="tprefaud_wst"><a name="tprefaud_wst"><!-- --></a>
<h1 class="topictitle1">Defining the audio preference</h1>
-<div><p>Using the Preferences page, you can define the preferences that
-servers will use for audio purposes. </p><div class="skipspace">To define these preferences, do the following:</div>
+<div><div>Using the Preferences page, you can define the preferences that
+servers will use for audio purposes. </div><div class="section">To define these preferences, do the following:</div>
<ol><li><span>From the Window menu, select <span class="uicontrol">Preferences</span>.</span></li>
<li><span>In the Preferences window, expand <span class="uicontrol">Server</span> and
then select <span class="uicontrol">Audio.</span></span></li>
<li><span>Specify one or more of the following settings:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<thead><tr><td><b>Option</b></td><td><b>Description</b></td></tr></thead>
-<tbody>
-<tr><td align="left" valign="top" id="d0e33"><b>Enable sounds</b></td>
-<td align="left" valign="top" headers="d0e33">Plays sound when an error
+<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
+<thead><tr><th id="d0e29-option" valign="bottom" align="left">Option</th>
+<th id="d0e29-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e29-option" id="d0e31"><strong>Enable sounds</strong></td>
+<td valign="top" headers="d0e29-desc d0e31">Plays sound when an error
occurs on the server, or whenever the server changes state (such as, changing
from "Starting" to "Started")</td>
</tr>
-<tr><td align="left" valign="top" id="d0e38"><b>Volume</b></td>
-<td align="left" valign="top" headers="d0e38">Adjusts the volume of the sound
+<tr><td valign="top" headers="d0e29-option" id="d0e36"><strong>Volume</strong></td>
+<td valign="top" headers="d0e29-desc d0e36">Adjusts the volume of the sound
played on your computer.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e43"><b>Sounds</b></td>
-<td align="left" valign="top" headers="d0e43">Lists the sounds events to which
+<tr><td valign="top" headers="d0e29-option" id="d0e41"><strong>Sounds</strong></td>
+<td valign="top" headers="d0e29-desc d0e41">Lists the sounds events to which
you can enable the sound. To enable sound for an event, select the check box
beside the event.</td>
</tr>
@@ -48,5 +47,10 @@
save your changes.</span></li>
</ol>
</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
new file mode 100644
index 0000000..c44215a
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
@@ -0,0 +1,34 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Publishing applications to a server</title>
+</head>
+<body onresize="location.reload();" id="tpublish_wst"><a name="tpublish_wst"><!-- --></a>
+
+<h1 class="topictitle1">Publishing applications to a server</h1>
+<div><div></div></div>
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twpub.html">Publishing your application</a></strong><br />
+<em>Publishing</em> 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.</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 228afc0..d0fbed2 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,55 +16,47 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Debugging a servlet on a server</title>
</head>
-<body id="tservlet"><a name="tservlet"><!-- --></a>
-
+<body onresize="location.reload();" id="tservlet_wst"><a name="tservlet_wst"><!-- --></a>
<h1 class="topictitle1">Debugging a servlet on a server</h1>
-<div><p>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. </p><div class="skipspace">To debug a servlet on a server:</div>
-<ol><li class="skipspace"><span>In the Project Explorer view, open your servlet.</span> In
-
-a Web project, servlets are located in the JavaSource folder. The servlet opens in
-
-the Java editor.</li>
-<li class="skipspace"><span>To set one or more breakpoints in the editor, double-click in the
-
-margin beside the line of code that you want to set as a breakpoint.</span></li>
-<li class="skipspace"><span>Ensure the project is associated to run on a server.</span></li>
-<li class="skipspace"><span>Select the servlet and from the servlet's context menu in the Project
-
-Explorer view, click <span class="uicontrol">Debug As > Debug on Server</span>.</span> Open the Servers view to see that the server is launched.</li>
-<li class="skipspace"><span>When the breakpoint is hit, the Debug view opens.</span> Step
-
-through the code, inspect and display variables, and make any necessary changes
-
-to the servlet. For detailed information on debugging, refer to the online
-
-help.</li>
-<li class="skipspace"><span>When you are finished debugging, remove the breakpoint and save
-
-the servlet.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Resume</span> icon on the Debug toolbar
-
-to execute the servlet.</span></li>
-<li class="skipspace"><span>If you have hot method replace enabled, your changes are already
-
-in the running application.</span></li>
-<li class="skipspace"><span>If you have automatic class reloading enabled, which is the default
-
-setting, click the <span class="uicontrol">Refresh</span> icon in the Web Browser
-
-to update the changes.</span> You do not lose the state of your application.</li>
-<li class="skipspace"><span>You lose the state of the application.</span> To update the
-
-changes restart the server.
-</li>
+<div><div>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.</div><div class="section" id="tservlet_wst__tservlet_context"><a name="tservlet_wst__tservlet_context"><!-- --></a>To debug a servlet on a server:</div>
+<ol><li class="stepexpand" id="tservlet_wst__tservlet_step1"><a name="tservlet_wst__tservlet_step1"><!-- --></a><span>In the Project Explorer view, open your servlet.</span> In a Web project, servlets are located in the JavaSource folder. The
+servlet opens in an editor.</li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step2"><a name="tservlet_wst__tservlet_step2"><!-- --></a><span>To set one or more breakpoints in the editor,
+double-click in the margin beside the line of code that you want to set as
+a breakpoint.</span></li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step3"><a name="tservlet_wst__tservlet_step3"><!-- --></a><span>Ensure the project is associated to run on
+a server.</span></li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step4"><a name="tservlet_wst__tservlet_step4"><!-- --></a><span>Select the servlet and from the servlet's context
+menu in the Project Explorer view, click <span class="uicontrol">Debug As > Debug on Server</span>.</span> Open the Servers view to see that the server is launched.</li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step5"><a name="tservlet_wst__tservlet_step5"><!-- --></a><span>When the breakpoint is hit, the Debug view
+opens.</span> Step through the code, inspect and display variables, and
+make any necessary changes to the servlet. For detailed information on debugging,
+refer to the online help.</li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step6"><a name="tservlet_wst__tservlet_step6"><!-- --></a><span>When you are finished debugging, remove the
+breakpoint and save the servlet.</span></li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step7"><a name="tservlet_wst__tservlet_step7"><!-- --></a><span>Click the <span class="uicontrol">Resume</span> icon
+on the Debug toolbar to execute the servlet.</span></li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step8"><a name="tservlet_wst__tservlet_step8"><!-- --></a><span>If you have hot method replace enabled, your
+changes are already in the running application.</span></li>
+<li class="stepexpand" id="tservlet_wst__tservlet_step9"><a name="tservlet_wst__tservlet_step9"><!-- --></a><span>If you have automatic class reloading enabled,
+which is the default setting, click the <span class="uicontrol">Refresh</span> icon
+in the Web Browser to update the changes.</span> You do not lose the state
+of your application.</li>
+<li class="stepexpand"><span id="tservlet_wst__tservlet_cmd10"><a name="tservlet_wst__tservlet_cmd10"><!-- --></a>If you do not have automatic class reloading
+enabled, you lose the state of the application.</span> To
+update the changes, restart the server.</li>
</ol>
-<div class="skipspace">The server recognizes your changes.
+<div class="section" id="tservlet_wst__tservlet_result"><a name="tservlet_wst__tservlet_result"><!-- --></a><strong>Result:</strong><p>The server recognizes
+your changes.</p>
+</div>
+</div>
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdebug.html" title="">Debugging applications on a server</a></div>
</div>
</div>
</body>
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
new file mode 100644
index 0000000..afd7c57
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
@@ -0,0 +1,39 @@
+<?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">
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Adding projects to a server</title>
+</head>
+<body onresize="location.reload();" id="twaddprj_wst"><a name="twaddprj_wst"><!-- --></a>
+<h1 class="topictitle1">Adding projects to a server</h1>
+<div><div>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.</div><div class="section"><p>This is done by adding your project to a server:</p>
+</div>
+<ol><li class="stepexpand"><span>In the Servers view, right-click on the server and select <span class="uicontrol">Add
+and remove projects</span>.</span></li>
+<li class="stepexpand"><span>In the Available projects list, select the project that you want
+to test and click <span class="uicontrol">Add</span>.</span></li>
+<li class="stepexpand"><span>The project appears in the Configured projects list.</span> Click <span class="uicontrol">Finish</span>.</li>
+</ol>
+<div class="section"><div class="note"><span class="notetitle">Note:</span> When you select a project to add to the server, only the projects
+that are applicable to the type of server will appear.</div>
+</div>
+</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 c7e4f02..16eb2bd 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
@@ -1,8 +1,7 @@
<?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>
-<head>
+<html lang="en-us" xml:lang="en-us">
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
@@ -16,32 +15,63 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Creating a server</title>
</head>
-<body id="twcrtins"><a name="twcrtins"><!-- --></a>
-
+<body onresize="location.reload();" id="twcrtins_wst"><a name="twcrtins_wst"><!-- --></a>
<h1 class="topictitle1">Creating a server</h1>
-<div><p>You can create a server to identify the run-time environment that
-you want to use for testing your project resources.</p><div class="skipspace">To create a server:</div>
-<ol><li class="skipspace"><span>In the menu bar, click <span class="uicontrol">File > New > Other</span>. </span></li>
-<li class="skipspace"><span>Expand the <span class="uicontrol">Server</span> folder and then select
+<div><div>You can create a server to identify the runtime environment that
+you want to use for testing your project resources.</div><div class="section">To create a server:</div>
+<ol><li class="stepexpand"><span>In the menu bar, click <span class="uicontrol">File > New > Other</span>. </span></li>
+<li class="stepexpand"><span>Expand the <span class="uicontrol">Server</span> folder and then select
<span class="uicontrol">Server</span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span> The New Server wizard
+<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span> The New Server wizard
opens. This wizard defines a new server, that contains information required
-to point to a specific run-time environment for local or remote testing, or
+to point to a specific runtime environment for local or remote testing, or
for publishing to an application server.</li>
-<li class="skipspace"><span>In the <span class="uicontrol">Host name</span> field, you can provide
-the fully qualified DNS name or IP address of the remote host machine that
-the server is running on. By default, this field is pre-filled with the default
-address for the local host (127.0.0.1).</span></li>
-<li class="skipspace"><span>In the <span class="uicontrol">Select the server type</span> list, select
+<li class="stepexpand"><span>In the <span class="uicontrol">Server's host name</span> field, you can
+provide the fully qualified DNS name or IP address of the host
+machine that where the server is running. By default, this field is pre-filled
+with the default address: <kbd class="userinput">localhost</kbd></span></li>
+<li class="stepexpand"><span>In the <span class="uicontrol">Select the server type</span> list, select
the type of server or test environment where you want to publish or test your
-resources.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span> and follow the instructions in
+resources.</span><ol type="a"><li class="substepexpand"><span>(Optional) Refer to the <span class="uicontrol">Description</span> section
+for brief details about the server you have selected.</span></li>
+<li class="substepexpand"><span>(Optional) In the <span class="uicontrol">View By</span> drop-down list,
+select how you would like to display the list of available servers in the <span class="uicontrol">Select
+the server type</span> list:</span> </li>
+</ol>
+
+<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
+<thead><tr><th id="d0e66-option" valign="bottom" align="left">Option</th>
+<th id="d0e66-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e66-option" id="d0e68"><strong>Name</strong></td>
+<td valign="top" headers="d0e66-desc d0e68">Alphabetically sorts the list of available
+servers.</td>
+</tr>
+<tr><td valign="top" headers="d0e66-option" id="d0e73"><strong>Vendor</strong></td>
+<td valign="top" headers="d0e66-desc d0e73">Categorize the list of available
+servers in vendor-specific folders.</td>
+</tr>
+<tr><td valign="top" headers="d0e66-option" id="d0e78"><strong>Version</strong></td>
+<td valign="top" headers="d0e66-desc d0e78">Categorize the list of available
+servers in folders based on the version of the servers.</td>
+</tr>
+<tr><td valign="top" headers="d0e66-option" id="d0e83"><strong>Module Support</strong></td>
+<td valign="top" headers="d0e66-desc d0e83">Categorize the list of available
+servers based on the supported J2EE module specification level by the server.</td>
+</tr>
+</tbody></table>
+</li>
+<li class="stepexpand"><span>Click <span class="uicontrol">Next</span> and follow the instructions in
the wizard to specify the details of the server that you want to create. For
more information about any of the fields on this wizard, select the field
and then press <span class="uicontrol">F1</span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> The new server
+<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The new server
appears in the Servers view under the <span class="uicontrol">Server</span> column.</li>
</ol>
</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/twdelins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html
index 2a959ab..04698fc 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,15 +16,21 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Deleting a server</title>
</head>
-<body id="twdelins"><a name="twdelins"><!-- --></a>
-
+<body onresize="location.reload();" id="twdelins_wst"><a name="twdelins_wst"><!-- --></a>
<h1 class="topictitle1">Deleting a server</h1>
-<div><p>You may delete a server from the Servers view. To
-delete a server:</p><div class="skipspace"></div>
-<ol><li><span>Right-click on the server that you want to delete.</span></li>
-<li><span>Select <b>Delete</b>. The Delete Server Resources dialog box opens</span></li>
-<li>Select the OK button if you want to delete the server.</li>
+<div><div>You may delete a server from the Servers view.</div><div class="section">To delete a server:</div>
+<ol><li class="stepexpand"><span>In the Servers view, right-click on the server that you want to
+delete.</span></li>
+<li class="stepexpand"><span>Select <strong>Delete</strong>. </span> The Delete Server Resources
+dialog box opens.</li>
+<li class="stepexpand"><span>Select the <span class="uicontrol">OK</span> button if you want to delete
+the server.</span></li>
</ol>
</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 14cdee2..7e6c96b 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,20 +16,30 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Editing a server</title>
</head>
-<body id="twedtins"><a name="twedtins"><!-- --></a>
-
+<body onresize="location.reload();" id="twedtins_wst"><a name="twedtins_wst"><!-- --></a>
<h1 class="topictitle1">Editing a server</h1>
-<div><p>The server tools feature provides you with editors so that you
-may change your server configuration. To edit a server, you can do one of the following:</p><ul><li class="skipspace"><span>Double-click on the server in the Servers view.</span></li>
-<li class="skipspace"><span>Right-click on the server in the Servers view, and then select
- <span class="uicontrol">Open</span>.</span> Depending on what run-time environment
-the server is defined to use, or whether it is defined as a local or remote
-server, the fields that you can change may be different.</li>
-<li class="skipspace"><span>To save your changes, you may either select <span class="menucascade"><span class="uicontrol">File
-> Save</span></span> or press <span class="uicontrol">CTRL+S</span>.</span></li>
-<li class="skipspace"><span>Make sure that the editor is closed before starting, restarting
-or adding and removing modules on the server</span></li>
+<div><div>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.</div><div class="section">To edit a server:</div>
+<ol><li class="stepexpand"><span>Open a server editor, completing one of the following:</span><ul><li>In the Servers view, double-click on the server that you want to edit.</li>
+<li>Right-click on the server in the Servers view, from the pop-up menu
+select <span class="uicontrol">Open</span>. </li>
</ul>
+</li>
+<li class="stepexpand"><span>When the server editor is open on the workbench, you can save your
+changes by either selecting from the toolbar <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">Save</span></span> or type <kbd class="userinput">CTRL+S</kbd>. </span> <div class="tip"><span class="tiptitle">Tip:</span> Changes to the server editor that has not yet been
+saved is indicated with a * icon located at the top of the server editor.
+After you save your edits on the server editor, the * icon should no longer
+appear on the server editor.</div>
+</li>
+<li class="stepexpand"><span>Make sure that the editor is closed before starting, restarting,
+or adding and removing modules on the server.</span></li>
+</ol>
+</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/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
new file mode 100644
index 0000000..07d50cf
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
@@ -0,0 +1,79 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Defining the installed server runtime environments</title>
+</head>
+<body onresize="location.reload();" id="twinstprf_wst"><a name="twinstprf_wst"><!-- --></a>
+<h1 class="topictitle1">Defining the installed server runtime environments</h1>
+<div><div>Using the Preferences page, you can direct the workbench to use
+a specific runtime environment of an application server for compiling your
+application. You can complete this by defining the installation directory
+of the server:</div><ol><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>
+<li class="stepexpand"><span><strong>Optional: </strong>Click <span class="uicontrol">Search</span>.
+This searches your local directory for installed 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,
+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>
+<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;
+then click <span class="uicontrol">OK</span> in the Preferences dialog. If no installations
+of any application servers are found, continue completing the steps for this
+task.</span></li>
+</ol>
+</li>
+<li class="stepexpand"><span>Click <span class="uicontrol">Add</span>.</span> The New Server Runtime
+wizard opens.<ol type="a"><li class="substepexpand"><span>Select the target server runtime and click <span class="uicontrol">Next</span>.
+The <em>product_name</em> Runtime panel 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
+you specify a false location for the target server, use the workbench to assemble
+modules and then use the application server to deploy the modules.</div>
+ If you selected for a target server <strong>J2EE Runtime Library</strong>, a generic
+J2EE container, specify a directory that contains <tt>.jar</tt> files such
+a <tt>\bin\lib</tt> directory for a Java development kit installation.</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>
+<li class="substepexpand"><span>In the Preferences dialog, click <span class="uicontrol">OK</span>.</span></li>
+</ol>
+</li>
+</ol>
+<div class="section"><p>To change the list of available target servers, click <strong>Window
+> Preferences > Server > 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>
+<p>To change the target
+server for a module, right-click on the module in the Project Explorer view
+and click <strong>Properties > Server</strong>. Change the value for <strong>Target runtime</strong> to
+select a different target server for the module.</p>
+<div class="important"><span class="importanttitle">Important:</span> If
+you change the target server for an EJB project, regenerate the deployment
+code. Right-click the EJB project, and select <strong>Deploy</strong>. If you attempt
+to run an application on a server target that is different from its generated
+deployment code, the application fails to run.</div>
+</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/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
new file mode 100644
index 0000000..6abf5fd
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
@@ -0,0 +1,47 @@
+<?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>
+<!-- /*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/ -->
+<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<title>Managing servers </title>
+</head>
+<body onresize="location.reload();" id="twmanage_wst"><a name="twmanage_wst"><!-- --></a>
+<h1 class="topictitle1">Managing servers </h1>
+<div><div>You can use the server tools views to manage servers.
+The following tasks may be included as part of the development path:</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>
+</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 d56d741..7d79a40 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,20 +16,24 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Setting a default server</title>
</head>
-<body id="twprefin"><a name="twprefin"><!-- --></a>
-
+<body onresize="location.reload();" id="twprefin_wst"><a name="twprefin_wst"><!-- --></a>
<h1 class="topictitle1">Setting a default server</h1>
-<div><p>A default server is the server that you want to use when a project
-has more than one server defined.</p><div class="skipspace"><p>To set a default server:</p>
+<div><div>A default server is the server that you want to use when a project
+has more than one server defined.</div><div class="section"><p>To set a default server:</p>
</div>
-<ol><li class="skipspace"><span>Right-click on your project.</span> The context menu for this
+<ol><li class="stepexpand"><span>Right-click on your project.</span> The pop-up menu for this
project appears.</li>
-<li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">Properties > Server</span></span>.</span> The Server pane appears on the right.</li>
-<li class="skipspace"><span>Under the <span class="uicontrol">Default server</span> list, select the
+<li class="stepexpand"><span>Select <span class="menucascade"><span class="uicontrol">Properties </span> > <span class="uicontrol">Server</span></span>.</span> The Server pane appears on the right.</li>
+<li class="stepexpand"><span>Under the <span class="uicontrol">Default server</span> list, select the
server that you want to become the default server.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
+<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
save your changes and close the Properties window.</span></li>
</ol>
</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 8e435ef..f22cd06 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,74 +16,36 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Publishing your application</title>
</head>
-<body id="twpub"><a name="twpub"><!-- --></a>
-
+<body onresize="location.reload();" id="twpub_wst"><a name="twpub_wst"><!-- --></a>
<h1 class="topictitle1">Publishing your application</h1>
-<div><p>In this product, 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.</p>
-<p>You can either publish your application automatically or manually.
-
-If the <span class="uicontrol">Automatically publish before starting servers</span> check
-
-box on the Server preferences page ( <span class="uicontrol">Window > Preferences > Server</span>)
-
+<div><div><em>Publishing</em> 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.</div><div class="section"><p id="twpub_wst__twpub_p1"><a name="twpub_wst__twpub_p1"><!-- --></a>You can either publish your application automatically
+or manually. If the <span class="uicontrol">Automatically publish when starting servers</span> check
+box on the Server preferences page (<span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Server</span></span>)
is selected, the server tools check to see if your project and files on the
-
server are synchronized. If they are not, the project and the files are automatically
-
updated when the server is either started or restarted.</p>
-
-<p>To publish your application manually you can
-
-complete one of the following in the Servers view:</p>
+<p id="twpub_wst__twpub_p2"><a name="twpub_wst__twpub_p2"><!-- --></a>To
+publish your application manually you can complete one of the following in
+the Servers view:</p>
</div>
-<ul><li><span>Select the server and then click the <span class="uicontrol">Publish to the
-
-server</span> <img src="../images/launch_publish.gif" alt="Picture of Publish toolbar icon" /> icon
-
-located on the toolbar.</span></li>
-<li><span>Right-click the server and then select <span class="uicontrol">Publish</span>.</span></li>
+<ul><li><span><span id="twpub_wst__twpub_steps_ph1"><a name="twpub_wst__twpub_steps_ph1"><!-- --></a>Select the server and then click the <span class="uicontrol">Publish
+to the server</span></span> <img src="../images/launch_publish.gif" alt="Picture of Publish toolbar icon" onload="javascript:resizeimage(this);" name="../images/launch_publish.gif" /> <span id="twpub_wst__twpub_steps_ph2"><a name="twpub_wst__twpub_steps_ph2"><!-- --></a>icon
+located on the toolbar.</span></span></li>
+<li id="twpub_wst__twpub_steps_step2"><a name="twpub_wst__twpub_steps_step2"><!-- --></a><span>Right-click the server and then select <span class="uicontrol">Publish</span>.</span></li>
</ul>
-
-<p>All the projects defined in the
-
-server configuration that are associated with the selected server are published.
-
-The resources in these projects are transferred to the location that is defined
-
-by the server.</p>
-<!-- <p>The Publishing Details dialog box appears allowing you
-
-to monitor the projects and files being published by displaying their status.
-
-Click <span class="uicontrol">Details</span> to display more detailed information
-
-in a scrollable box at the bottom of this dialog. The Publishing Details dialog
-
-box automatically closes when publishing completes. If you want to leave this
-
-dialog open after publishing, select the <span class="uicontrol">Keep publishing dialog
-
-open after publishing</span> check box on the Server preferences page.</p>
+<div class="section"><p id="twpub_wst__twpub_p3"><a name="twpub_wst__twpub_p3"><!-- --></a>All the projects defined in the server configuration
+that are associated with the selected server are published. The resources
+in these projects are transferred to the location that is defined by the server.</p>
</div>
-<div class="p"><a name="fntarg_1" href="#fnsrc_1"><sup>1</sup></a> WebSphere test environments
-
-are not available in WebSphere Application Server Toolkit.</div><div class="p"><a name="fntarg_2" href="#fnsrc_2"><sup>2</sup></a> Tomcat test
-
-environments are not available in WebSphere Application Server Toolkit.</div><div class="p"><a name="fntarg_3" href="#fnsrc_3"><sup>3</sup></a> Support for
-
-Tomcat servers are not available in WebSphere Application Server Toolkit.</div><div class="p"><a name="fntarg_4" href="#fnsrc_4"><sup>4</sup></a> J2EE publishing servers are not available in WebSphere Application
-
-Server Toolkit.</div><div class="p"><a name="fntarg_5" href="#fnsrc_5"><sup>5</sup></a> Static Web publishing servers
-
-are not available in WebSphere Application Server Toolkit.</div><div class="runningfooter">-->
- <br />
+</div>
+<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>
</body>
</html>
\ No newline at end of file
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 4eaf686..46a0405 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,15 +16,19 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Removing a project from a server</title>
</head>
-<body id="twremprj"><a name="twremprj"><!-- --></a>
-
+<body onresize="location.reload();" id="twremprj_wst"><a name="twremprj_wst"><!-- --></a>
<h1 class="topictitle1">Removing a project from a server</h1>
-<div><p>To remove a project from a server:</p><div class="skipspace"></div>
-<ol><li><span>In the Servers view, right-click on the server and select <span class="uicontrol">Add
-and remove projects</span>.</span></li>
+<div><div>To remove a project from a server:</div><div class="section"></div>
+<ol><li><span>In the Servers view, right-click on the server containing the project
+you want to remove and select <span class="uicontrol">Add and remove projects</span>.</span></li>
<li><span>In the Configured projects list, select the project and click the <span class="uicontrol">Remove</span> button.</span></li>
<li><span>The project appears in the Available projects list. Click <span class="uicontrol">Finish</span>.</span></li>
</ol>
</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 2d65d8a..4df13b9 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
@@ -1,8 +1,7 @@
<?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>
-<head>
+<html lang="en-us" xml:lang="en-us">
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
@@ -16,33 +15,36 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Starting a server in debug mode</title>
</head>
-<body id="twsrtdbg"><a name="twsrtdbg"><!-- --></a>
-
+<body onresize="location.reload();" id="twsrtdbg_wst"><a name="twsrtdbg_wst"><!-- --></a>
<h1 class="topictitle1">Starting a server in debug mode</h1>
-<div><p>If you want to debug your projects while a server runs, you can
-start a server in debug mode.</p><div class="p"><b>Prerequisites:</b>
-<ol>
-<li><a href="twcrtins.html#twcrtins">Create a server.</a></li>
-<li>Add a project to the server.</li>
+<div><div>If you want to debug your projects while
+a server runs, you can start a server in debug mode.</div><div class="p" id="twsrtdbg_wst__twsrtdbg_prereq"><a name="twsrtdbg_wst__twsrtdbg_prereq"><!-- --></a><strong>Prerequisites:</strong><ul><li><a href="twcrtins.html">Create a server.</a></li>
+<li><a href="twaddprj.html">Add a project to the server.</a></li>
<li>Edit the file you want to run and set breakpoints.</li>
<li>Open the Debug perspective.</li>
-</ol>
+</ul>
</div>
-<div class="skipspace"><p>Once you have started the server in debug mode you can run the
-projects that are associated with the server. You can stop and
-restart the server at any time. The status of the server is displayed in the <span class="uicontrol"> Status </span> column
-of the Servers view. The status of the breakpoints in your file is displayed
-in the Debug view.</p>
-<p>To manually start the server in debug mode:</p>
+<div class="section" id="twsrtdbg_wst__twsrtdbg_context"><a name="twsrtdbg_wst__twsrtdbg_context"><!-- --></a><p>Once you have started the server in debug
+mode you can run the projects that are associated with the server. You can
+stop and restart the server at any time. The status of the server is displayed
+in the <span class="uicontrol"> Status </span> column of the Servers view. The status
+of the breakpoints in your file is displayed in the Debug view.</p>
+<p>To manually
+start the server in debug mode:</p>
<p> </p>
</div>
-<ol><li class="skipspace"><span>In the Servers view ( <span class="menucascade"><span class="uicontrol">Window > Show View
-> Other > Server > Servers</span></span>), right-click the server
-you want to start in debug mode.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Debug </span> <img src="../images/launch_debug.gif" alt="Picture of Start in debug mode icon" /> on the Server toolbar. </span> In the <span class="uicontrol">Status</span> column of the Servers view, the
-status of the server changes to <i>Debugging</i>, after the server is started
-in debug mode.</li>
+<ol><li class="stepexpand" id="twsrtdbg_wst__twsrtdbg_step1"><a name="twsrtdbg_wst__twsrtdbg_step1"><!-- --></a><span>In the Servers view ( <span class="menucascade"><span class="uicontrol">Window
+> Show View > Other > Server > Servers > OK</span></span>),
+right-click the server you want to start in debug mode.</span></li>
+<li class="stepexpand"><span><span id="twsrtdbg_wst__twsrtdbg_steps_ph1"><a name="twsrtdbg_wst__twsrtdbg_steps_ph1"><!-- --></a>In the pop-up menu select <span class="uicontrol">Debug </span> </span> <img src="../images/launch_debug.gif" alt="Picture of Start in debug mode icon" onload="javascript:resizeimage(this);" name="../images/launch_debug.gif" /> . </span> <span id="twsrtdbg_wst__twsrtdbg_steps_ph2"><a name="twsrtdbg_wst__twsrtdbg_steps_ph2"><!-- --></a>In the <span class="uicontrol">Status</span> column
+of the Servers view, the status of the server changes to <em>Debugging</em>,
+after the server is started in debug mode.</span></li>
</ol>
</div>
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <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/twsrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html
index 006810c..68af95b 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,34 +16,28 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Starting a server</title>
</head>
-<body id="twsrtins"><a name="twsrtins"><!-- --></a>
-
+<body onresize="location.reload();" id="twsrtins_wst"><a name="twsrtins_wst"><!-- --></a>
<h1 class="topictitle1">Starting a server</h1>
-<div><p>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.</p>
-<div class="p"><b>Prerequisites</b>
-<ul>
-<li><a href="twcrtins.html#twcrtins">Create a server.</a></li>
-<li>Add a project to the server.</li>
+<div><div>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.</div><div class="p"><strong id="twsrtins_wst__twsrtins_prereq"><a name="twsrtins_wst__twsrtins_prereq"><!-- --></a>Prerequisites:</strong><ul><li id="twsrtins_wst__twsrtins_prereq_li1"><a name="twsrtins_wst__twsrtins_prereq_li1"><!-- --></a><a href="twcrtins.html">Create a server.</a></li>
</ul>
</div>
-<div class="skipspace"><p>Once you have started the server you can test the projects that
-are associated with the server. You can stop and restart the server at any
-time. The status of the server is displayed in the <span class="uicontrol">Status</span> column
+<div class="section" id="twsrtins_wst__twrstins_context"><a name="twsrtins_wst__twrstins_context"><!-- --></a><p>Once you have started the server you can
+test the projects that are associated with the server. You can stop and restart
+the server at any time. The status of the server is displayed in the <span class="uicontrol">Status</span> column
of the Servers view.</p>
<p>To manually start a server:</p>
</div>
-<ol><li class="skipspace"><span>Switch to the Servers view.</span></li>
-<li class="skipspace"><span>In the Servers view, right-click the server you want to start.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Start</span>. </span> The following
-things happen:<ul><li>If you have selected the <span class="uicontrol">Automatically publish before starting
-servers</span> check box on the Server preferences page (Window > Preferences
-> Server), the server tools check to see if your project and files on the
-server are synchronized prior to starting the server. If they are not, the
-project and the files are automatically updated on the remote server when
-it is started.</li>
+<a name="twsrtins_wst__twrtins_steps"><!-- --></a><ol id="twsrtins_wst__twrtins_steps"><li class="stepexpand"><span>Switch to the Servers view.</span></li>
+<li class="stepexpand"><span>In the Servers view, right-click the server you want to start.</span></li>
+<li class="stepexpand"><span>Select <span class="uicontrol">Start</span>. </span> The following
+things happen:<ul><li>If you have selected the <span class="uicontrol">Automatically publish when starting
+servers</span> check box on the Server preferences page (<span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol"> Preferences</span> > <span class="uicontrol">Server</span></span> ), the workbench checks to see if your project
+and files on the server are synchronized prior to starting the server. If
+they are not, the project and the files are automatically updated on the remote
+server when it is started.</li>
<li>A Console view opens in the workbench. It will take a minute to start
the server. If the server fails to start, check for the reason that it failed
in the Console.</li>
@@ -52,8 +46,23 @@
</ul>
</li>
</ol>
-<div class="skipspace"><div class="tip"><span class="tiptitle">Tip: </span>The server is automatically started when you right-click
-on a file and then select <span class="uicontrol">Run > Run on Server</span>.</div>
+<div class="section" id="twsrtins_wst__twsrtins_result"><a name="twsrtins_wst__twsrtins_result"><!-- --></a><div class="tip"><span class="tiptitle">Tip:</span> The server is automatically
+started when you right-click on a file and then select <span class="uicontrol">Run As
+> Run on Server</span>.</div>
+</div>
+</div>
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/twsrtdbg.html">Starting a server in debug mode</a></strong><br />
+If you want to debug your projects while
+a server runs, you can start a server in debug mode.</li>
+</ul>
+
+<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="A server can either be started manually or automatically. For example, it is automatically started when you right-click a project in the Project Explorer view and select Run As > Run on Server. It is manually started when you click on the Start the server Picture of the Run on Server icon icon, the Start the server in debug mode PIcture of the Debug on server Icon icon , or the Start the server in profiling mode icon, located in the Servers view.">Which server will start</a></div>
</div>
</div>
</body>
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 41a31f6..6456489 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,115 +16,91 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Defining the Server preference</title>
</head>
-<body id="twsrvprf"><a name="twsrvprf"><!-- --></a>
-
+<body onresize="location.reload();" id="twsrvprf_wst"><a name="twsrvprf_wst"><!-- --></a>
<h1 class="topictitle1">Defining the Server preference</h1>
-<div><p>Using the Preferences page, you can define attributes used for
-
-testing projects by the servers. To define these preferences, do the
-
-following:</p><ol><li><span>From the Window menu, select <span class="uicontrol">Preferences</span>.</span></li>
-<li><span>In the Preferences page, select <span class="uicontrol">Server</span>.</span></li>
-<li><span>Specify one or more of the following settings by selecting the
-
+<div><div>Using the Preferences page, you can define attributes used for
+testing projects by the servers. To define these preferences, do the following:</div><ol><li class="stepexpand"><span>In the toolbar, select <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>.</span></li>
+<li class="stepexpand"><span>In the Preferences page, select <span class="uicontrol">Server</span>.</span></li>
+<li class="stepexpand"><span>Specify one or more of the following settings by selecting the
appropriate check box:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<thead><tr><td><b>Option</b></td><td><b>Description</b></td></tr></thead>
-<tbody>
-<tr><td align="left" valign="top" id="d0e28"><b>Automatically publish before starting servers</b></td>
-<td align="left" valign="top" headers="d0e28">Specifies that all the files should automatically be published before
-
-starting the server.</td>
+<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
+<thead><tr><th id="d0e28-option" valign="bottom" align="left">Option</th>
+<th id="d0e28-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e28-option" id="d0e30"><strong>Show Servers view when server state changes</strong></td>
+<td valign="top" headers="d0e28-desc d0e30">The
+Servers view is displayed on the workbench when there are any activities in
+the Servers view. For more details about the server states refer to the <a href="rwrcview.html">Servers View</a> topic.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e38"><b>Automatically restart servers when necessary</b></td>
-<td align="left" valign="top" headers="d0e38">Specifies
-
+<tr><td valign="top" headers="d0e28-option" id="d0e38"><strong>Automatically publish when starting servers</strong></td>
+<td valign="top" headers="d0e28-desc d0e38">Specifies
+that all the files should automatically be published before starting the server.</td>
+</tr>
+<tr><td valign="top" headers="d0e28-option" id="d0e43"><strong>Automatically publish to local server</strong></td>
+<td valign="top" headers="d0e28-desc d0e43">Specifies
+that all the files should automatically be published to the local server at
+every <em>seconds</em> intervals, where <em>seconds</em> is the number of seconds
+you have specified in the <span class="uicontrol">Publishing interval (in seconds)</span> control.
+The minimum value for the publishing interval is ten seconds.</td>
+</tr>
+<tr><td valign="top" headers="d0e28-option" id="d0e57"><strong>Automatically publish to remote server</strong></td>
+<td valign="top" headers="d0e28-desc d0e57">Specifies
+that all the files should automatically be published to the remote server
+at every <em>seconds</em> intervals, where <em>seconds</em> is the number of seconds
+you have specified in the <span class="uicontrol">Publishing interval (in seconds)</span> control.
+The minimum value for the publishing interval is ten seconds.</td>
+</tr>
+<tr><td valign="top" headers="d0e28-option" id="d0e71"><strong>Automatically restart servers when necessary</strong></td>
+<td valign="top" headers="d0e28-desc d0e71">Specifies
that the server tools can automatically restart the server when it detects
-
that the server must be restarted to handle resource changes in the workspace.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e43"><b>Prompt before making irreversible changes within an editor</b></td>
-<td align="left" valign="top" headers="d0e43">Specifies that the server tools will prompt you before you make a
-
+<tr><td valign="top" headers="d0e28-option" id="d0e76"><strong>Prompt before making irreversible changes within an editor</strong></td>
+<td valign="top" headers="d0e28-desc d0e76">Specifies that the server tools will prompt you before you make a
change in a editor that cannot be undone.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e48"><b>Create server resources in workspace</b></td>
-<td align="left" valign="top" headers="d0e48">Specifies
-
-that when a server is created to also create its server and server configuration
-
-files to be displayed in the workspace. For example, when this check box is
-
-selected; in the Navigator view, these server resources appear in the server
-
-project folder. By default, this option is disabled and the resources are
-
-saved as metadata.</td>
-</tr>
</tbody></table>
</li>
-<li><span>Under <span class="uicontrol">Save dirty editors before starting server</span>,
-
+<li class="stepexpand"><span>Under <span class="uicontrol">Save dirty editors before starting server</span>,
specify the preferences for saving the changes in any open server editors
-
before starting the server by selecting one of the following:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<thead><tr><td><b>Option</b></td><td><b>Description</b></td></tr></thead>
-<tbody>
-<tr><td align="left" valign="top" id="d0e60"><b>Never</b></td>
-<td align="left" valign="top" headers="d0e60">Specifies that the server tools will
-
+<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
+<thead><tr><th id="d0e86-option" valign="bottom" align="left">Option</th>
+<th id="d0e86-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e86-option" id="d0e88"><strong>Never</strong></td>
+<td valign="top" headers="d0e86-desc d0e88">Specifies that the server tools will
not save the changes in any open editors before starting the server.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e65"><b>Prompt</b></td>
-<td align="left" valign="top" headers="d0e65">Specifies that the server tools
-
+<tr><td valign="top" headers="d0e86-option" id="d0e93"><strong>Prompt</strong></td>
+<td valign="top" headers="d0e86-desc d0e93">Specifies that the server tools
will prompt you before saving any changes in an open server editor.</td>
</tr>
-<tr><td align="left" valign="top" id="d0e70"><b>Auto-save</b></td>
-<td align="left" valign="top" headers="d0e70">Specifies that the server tools
-
+<tr><td valign="top" headers="d0e86-option" id="d0e98"><strong>Auto-save</strong></td>
+<td valign="top" headers="d0e86-desc d0e98">Specifies that the server tools
will automatically save any changes in an open server editor before starting
-
the server.</td>
</tr>
</tbody></table>
</li>
-
-<!-- <li><span>Under <span class="uicontrol">Publishing method</span>, specify the publisher
-
-that you want to use by selecting one of the following:</span>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<thead><tr><td><b>Option</b></td><td><b>Description</b></td></tr></thead>
-<tbody>
-<tr><td align="left" valign="top" id="d0e104"><b>Smart publish</b></td>
-<td align="left" valign="top" headers="d0e104">Specifies that you want the
-
-server tools to publish to the server only the changed resources. All resources
-
-that no longer exist in the workspace are deleted on the server. This is the
-
-default value.</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e109"><b>Prompt user</b></td>
-<td align="left" valign="top" headers="d0e109">Specifies that you want to
-
-choose which resources to publish to the server or to remove from the server.</td>
-</tr>
-<tr><td align="left" valign="top" id="d0e114"><b>Publish all</b></td>
-<td align="left" valign="top" headers="d0e114">Specifies that you want to
-
-publish all resources to the server, regardless of whether they have changed.
-
-No resources are deleted from the server.</td>
-</tr>
-</tbody></table>
-</li>-->
-<li><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-
+<li class="stepexpand"><span>Under the <span class="uicontrol">Server timeout delay</span> drop-down
+list, select one of the following relative length of time you can wait before
+ending a server operation:</span><ul><li>Longer</li>
+<li>Long</li>
+<li>Normal</li>
+<li>Short</li>
+<li>Shorter</li>
+</ul>
+ The default setting is <span class="uicontrol">Normal</span>. <div class="tip"><span class="tiptitle">Tip:</span> If you have a fast processing machine, you can try using the <span class="uicontrol">Shorter</span> timeout
+delay option. If you have a slow processing machine, you can try using the <span class="uicontrol">Longer</span> timeout
+delay option.</div>
+</li>
+<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
save your changes.</span></li>
</ol>
</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/twstpins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html
index 23f415a..1b5df41 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,25 +16,31 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Stopping a server</title>
</head>
-<body id="twstpins"><a name="twstpins"><!-- --></a>
-
+<body onresize="location.reload();" id="twstpins_wst"><a name="twstpins_wst"><!-- --></a>
<h1 class="topictitle1">Stopping a server</h1>
-<div><p>To stop a server:</p>
-<ol><li class="skipspace"><span>In the Servers view ( <b>Window > Show View > Other > Server >
-Servers</b>), select the server that you want to stop.</span></li>
-<li class="skipspace"><span>Click the <span class="uicontrol">Stop the server</span> <img src="../images/launch_stop.gif" alt="Picture of Stop icon" /> icon in the toolbar.</span> In the <span class="uicontrol">Status</span> column
-of the Servers view, the status of the server changes to <i>Stopped</i>.</li>
-<li class="skipspace"><span>If for some reason the server fails to stop, you can terminate
-the process as follows:</span><ol type="a"><li><span>Switch to the Debug perspective.</span></li>
-<li><span>In the Process view, select the server process that you want
-to stop.</span></li>
-<li><span>Click the <span class="uicontrol">Terminate</span> <img src="../images/launch_stop.gif" alt="Picture of Terminate icon" /> icon in the toolbar.</span></li>
+<div><div>You can stop the server from the Servers
+view.</div><div class="section" id="twstpins_wst__twstpins_context"><a name="twstpins_wst__twstpins_context"><!-- --></a>To stop the server:</div>
+<ol><li class="stepexpand" id="twstpins_wst__twstpins_step1"><a name="twstpins_wst__twstpins_step1"><!-- --></a><span>In the Servers view ( <strong>Window > Show View
+> Other > Server > Servers > OK</strong>), select the server that you want to stop.</span></li>
+<li class="stepexpand"><span><span id="twstpins_wst__twstpins_steps_ph1"><a name="twstpins_wst__twstpins_steps_ph1"><!-- --></a>Click the <span class="uicontrol">Stop the server</span></span> <img src="../images/launch_stop.gif" alt="Picture of Stop icon" onload="javascript:resizeimage(this);" name="../images/launch_stop.gif" /> <span id="twstpins_wst__twstpins_steps_ph2"><a name="twstpins_wst__twstpins_steps_ph2"><!-- --></a>icon
+in the toolbar.</span></span> <span id="twstpins_wst__twstpins_steps_ph3"><a name="twstpins_wst__twstpins_steps_ph3"><!-- --></a>In the <span class="uicontrol">Status</span> column
+of the Servers view, the status of the server changes to <em>Stopped</em>.</span></li>
+<li class="stepexpand"><span><span id="twstpins_wst__twstpins_steps_ph4"><a name="twstpins_wst__twstpins_steps_ph4"><!-- --></a>If for some reason the server fails
+to stop, you can terminate the process as follows:</span></span><ol type="a"><li id="twstpins_wst__twstpins_steps_substep1"><a name="twstpins_wst__twstpins_steps_substep1"><!-- --></a><span>Switch to the Debug perspective.</span></li>
+<li id="twstpins_wst__twstpins_steps_substep2"><a name="twstpins_wst__twstpins_steps_substep2"><!-- --></a><span>In the Process view, select the
+server process that you want to stop.</span></li>
+<li><span><span id="twstpins_wst__twstpins_steps_ph6"><a name="twstpins_wst__twstpins_steps_ph6"><!-- --></a>Click the <span class="uicontrol">Terminate</span></span> <img src="../images/launch_stop.gif" alt="Picture of Terminate icon" onload="javascript:resizeimage(this);" name="../images/launch_stop.gif" /> <span id="twstpins_wst__twstpins_steps_ph7"><a name="twstpins_wst__twstpins_steps_ph7"><!-- --></a>icon in the toolbar.</span></span></li>
</ol>
</li>
</ol>
-<div class="skipspace"><div class="note"><span class="notetitle">Note: </span>When terminating a server, the server process will be killed
-and the server will not go through the normal routine of stopping, for example
-calling the destroy() method on a servlet.</div>
+<div class="section" id="twstpins_wst__twstpins_result"><a name="twstpins_wst__twstpins_result"><!-- --></a><div class="note"><span class="notetitle">Note:</span> When terminating a server, the server process
+will end and the server will not go through the normal routine
+of stopping, for example calling the destroy() method on a servlet.</div>
+</div>
+</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>
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 eac187a..6f6006f 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
@@ -1,7 +1,7 @@
<?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>
+<html lang="en-us" xml:lang="en-us">
<head>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2005 IBM Corporation and others.
@@ -16,38 +16,37 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Defining the TCP/IP Monitor preference</title>
</head>
-<body id="twtcpprf"><a name="twtcpprf"><!-- --></a>
-
+<body onresize="location.reload();" id="twtcpprf_wst"><a name="twtcpprf_wst"><!-- --></a>
<h1 class="topictitle1">Defining the TCP/IP Monitor preference</h1>
-<div><p>Using the Preferences page, you can define the TCP/IP Monitor attributes. To
-define these preferences, complete the following:</p><div class="section"></div>
-<ol><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 <span class="uicontrol">Internet</span> and
+<div><div>Using the Preferences page, you can define the TCP/IP Monitor attributes. To
+define these preferences, complete the following:</div><div class="section"></div>
+<ol><li class="stepexpand"><span>From the toolbar, select <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span></span>.</span></li>
+<li class="stepexpand"><span>In the Preferences window, expand <span class="uicontrol">Run/Debug</span> and
then select <span class="uicontrol">TCP/IP Monitor</span>.</span></li>
<li class="stepexpand"><span>Select the <span class="uicontrol">Show TCP/IP Monitor View when there is activity</span> check
box if you want to display the TCP/IP Monitor view when there is activity
through a TCP/IP monitoring server.</span></li>
<li class="stepexpand"><span>To add a TCP/IP monitoring server, complete the following:</span><ol type="a"><li class="substepexpand"><span>Under the <span class="uicontrol">TCP/IP Monitors</span> lists, click <span class="uicontrol">Add</span>.</span> A <span class="uicontrol">New Monitor</span> dialog opens.</li>
-<li class="substepexpand"><span>Specify the following settings, then click <strong>OK</strong>:</span></li>
+<li class="substepexpand"><span>Specify the following settings, then click <span class="uicontrol">OK</span>:</span></li>
</ol>
<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="choicetableborder">
-<thead><tr><th id="d0e53-option" valign="bottom" align="left">Option</th>
-<th id="d0e53-desc" valign="bottom" align="left">Description</th></tr></thead>
-<tbody><tr><td valign="top" headers="d0e53-option" id="d0e55"><strong>Local monitoring port</strong></td>
-<td valign="top" headers="d0e53-desc d0e55">Specify a unique
+<thead><tr><th id="d0e59-option" valign="bottom" align="left">Option</th>
+<th id="d0e59-desc" valign="bottom" align="left">Description</th></tr></thead>
+<tbody><tr><td valign="top" headers="d0e59-option" id="d0e61"><strong>Local monitoring port</strong></td>
+<td valign="top" headers="d0e59-desc d0e61">Specify a unique
port number on your local machine.</td>
</tr>
-<tr><td valign="top" headers="d0e53-option" id="d0e60"><strong>Host name</strong></td>
-<td valign="top" headers="d0e53-desc d0e60">Specify the host name or IP address
+<tr><td valign="top" headers="d0e59-option" id="d0e66"><strong>Host name</strong></td>
+<td valign="top" headers="d0e59-desc d0e66">Specify the host name or IP address
of the machine where the server is running.</td>
</tr>
-<tr><td valign="top" headers="d0e53-option" id="d0e65"><strong>Port</strong></td>
-<td valign="top" headers="d0e53-desc d0e65">Specify the port number of the remote
+<tr><td valign="top" headers="d0e59-option" id="d0e71"><strong>Port</strong></td>
+<td valign="top" headers="d0e59-desc d0e71">Specify the port number of the remote
server.</td>
</tr>
-<tr><td valign="top" headers="d0e53-option" id="d0e70"><strong>Type</strong></td>
-<td valign="top" headers="d0e53-desc d0e70">Specify whether the request type from
+<tr><td valign="top" headers="d0e59-option" id="d0e76"><strong>Type</strong></td>
+<td valign="top" headers="d0e59-desc d0e76">Specify whether the request type from
the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected
the requests from the Web browser are modified so that the HTTP header points
to the remote machine and separated if multiple HTTP requests are received
@@ -55,22 +54,31 @@
are sent byte for byte and the TCP/IP Monitor will not translate or modify
any requests that it forwards. </td>
</tr>
+<tr><td valign="top" headers="d0e59-option" id="d0e81"><strong>Connection Timeout</strong></td>
+<td valign="top" headers="d0e59-desc d0e81">Specify the length of
+time, in milliseconds, that you can wait before ending the TCP/IP connection
+to a server.</td>
+</tr>
</tbody></table>
</li>
<li class="stepexpand"><span>Use the <span class="uicontrol">Start</span> and <span class="uicontrol">Stop</span> buttons
-to manage the TCP/IP monitoring servers.</span> The TCP/IP Monitor table
+to manage the TCP/IP monitoring servers.</span> The TCP/IP Monitor table
lists the available TCP/IP monitoring servers. You can add, edit, remove,
start or stop the available TCP/IP monitoring servers from the TCP/IP Monitor
table. The <strong>Status</strong> column shows if the TCP/IP monitor is started or
stopped. The <strong>Host name</strong> column shows the host name or IP address of
the machine where the server is running. The <strong>Type</strong> column shows whether
the request type from the Web browser are sent by HTTP or TCP/IP.</li>
-<li class="stepexpand"><span>Click <strong>OK</strong> to
+<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
save your changes.</span></li>
</ol>
</div>
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="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 > Preferences > Internet > TCP/IP Monitor).">TCP/IP Monitor view</a></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 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 > Run/Debug > TCP/IP Monitor).">TCP/IP Monitor view</a></div>
</div>
</div>
</body>
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
new file mode 100644
index 0000000..123ea43
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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>
+ <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.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
new file mode 100644
index 0000000..3092c43
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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="...servlets" href="topics/tservlet.html"/>
+ <topic label="...JSP file" href="topics/tdbgjsp.html"/>
+ </topic>
+</toc>
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
new file mode 100644
index 0000000..e9893e4
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Testing and publishing applications" topic="../org.eclipse.wst.server.ui.doc.user/topics/cwover.html">
+ <topic label="Application testing and publishing" href="../org.eclipse.wst.server.ui.doc.user/topics/cwover.html">
+ <topic label="Servers view" href="../org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html"/>
+ <topic label="Resources used by the Server Tools" href="../org.eclipse.wst.server.ui.doc.user/topics/cwres.html"/>
+ <topic label="Which test server will start" href="../org.eclipse.wst.server.ui.doc.user/topics/cwflow.html"/>
+ <topic label="Testing applications on a server" href="topics/tj2ee.html">
+ <topic label="Testing artifacts on a server" href="topics/testing.html"/>
+ </topic>
+ <topic label="Debugging applications on a server" href="topics/tdebug.html">
+ <topic label="...servlets" href="topics/tservlet.html"/>
+ <topic label="...JSP file" href="topics/tdbgjsp.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>
+ <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>
+ <topic label="Defining server preferences" href="topics/tpref.html">
+ <topic label="Defining the Server preference" href="topics/twsrvprf.html"/>
+ <topic label="Defining the audio preference" href="topics/tprefaud.html"/>
+ <topic label="Defining the TCP/IP Monitor preference" href="topics/twtcpprf.html">
+ <topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+ </topic>
+ <topic label="Defining the installed server run-time environments preference" href="topics/twinstprf.html">
+ <link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
+ </topic>
+ </topic>
+ </topic>
+</toc>
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
new file mode 100644
index 0000000..532414a
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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>
+</toc>
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
new file mode 100644
index 0000000..a480408
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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 preference" href="topics/twsrvprf.html"/>
+ <topic label="Defining the audio preference" href="topics/tprefaud.html"/>
+ <topic label="Defining the TCP/IP Monitor preference" href="topics/twtcpprf.html">
+ <topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+ </topic>
+ <topic label="Defining the installed server runtime environments" href="topics/twinstprf.html">
+ <link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
+ </topic>
+ </topic>
+</toc>
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
new file mode 100644
index 0000000..54b6675
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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_test.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
new file mode 100644
index 0000000..389a3f8
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ -->
+<?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>
+</toc>
