[157365] Including dita source with keyword metadata so that index can be generated
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 25fd9f2..5cc4192 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
+<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
@@ -29,5 +28,5 @@
point="org.eclipse.help.index">
<index file="org.eclipse.wst.server.ui.doc.userindex.xml"/>
</extension>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.dita
new file mode 100644
index 0000000..2eef458
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.dita
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
+<concept id="cwflow_wst" xml:lang="en-us">
+<title id="cwflow_title">Which server will start</title>
+<shortdesc id="cwflow_shortdesc"><ph id="cwflow_shortdesc_ph1">You can start
+the server automatically as part of running a selected resource on the server,
+or you can simply start the server without running resources on the server.
+For example, the server is automatically started when you right-click a project
+or an application resource in the Project Explorer view and select <menucascade>
+<uicontrol>Run As</uicontrol><uicontrol>Run on Server</uicontrol></menucascade>.
+If you want to start the server without running resources on the server, in
+the Servers view select a server and select the <b>Start the server</b></ph> <image
+alt="This is an image of the Run on Server icon." href="../images/launch_run.gif">
+<alt>This is an image of the Run on Server icon</alt></image> <ph id="cwflow_shortdesc_ph2">icon,
+the <b>Start the server in debug mode</b></ph> <image alt="This is an image of the Debug on server icon."
+href="../images/launch_debug.gif"><alt>This is an image of the Debug on server
+icon.</alt></image><ph id="cwflow_shortdesc_ph3"> icon , or the <uicontrol>Start
+the server in profiling mode</uicontrol></ph> <image alt="This is an image of the Start the server in profiling mode icon."
+href="../images/launch_profile.gif"><alt>This is an image of the Start the
+server in profiling mode icon.</alt></image><ph id="cwflow_shortdesc_ph4"> icon.</ph></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>starting</indexterm></indexterm>
+<indexterm>Run on Server wizard<?Pub Caret?></indexterm><indexterm>wizards<indexterm>Run
+on Server</indexterm></indexterm></keywords>
+</metadata></prolog>
+<conbody>
+<p id="cwflow_p1">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>
+<section id="cwflow_section1"><title>Run on Server</title><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> <uicontrol>Choose an existing server</uicontrol> 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 might be
+restarted if the server is already running.</li>
+<li> <uicontrol>Manually define a server</uicontrol> 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, <uicontrol>Manually
+define a server</uicontrol> is selected for you by default. When you select
+the type of server and click <uicontrol>Next</uicontrol>, a server will be
+automatically created for you and the server will start.</p></section>
+</conbody>
+</concept>
+<?Pub *0000003233?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
index f5f2eb3..be8c3c1 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -1,51 +1,69 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Which server will start" />
+<meta name="abstract" content="You can start the server automatically as part of running a selected resource on the server, or you can simply start the server without running resources on the server. For example, the server is automatically started when you right-click a project or an application resource in the Project Explorer view and select Run As > Run on Server. If you want to start the server without running resources on the server, in the Servers view select a server and select the Start the server This is an image of the Run on Server icon icon, the Start the server in debug mode This is an image of the Debug on server icon. icon , or the Start the server in profiling mode This is an image of the Start the server in profiling mode icon. icon." />
+<meta name="description" content="You can start the server automatically as part of running a selected resource on the server, or you can simply start the server without running resources on the server. For example, the server is automatically started when you right-click a project or an application resource in the Project Explorer view and select Run As > Run on Server. If you want to start the server without running resources on the server, in the Servers view select a server and select the Start the server This is an image of the Run on Server icon icon, the Start the server in debug mode This is an image of the Debug on server icon. icon , or the Start the server in profiling mode This is an image of the Start the server in profiling mode icon. icon." />
+<meta content="servers, starting, Run on Server wizard, wizards, Run on Server" name="DC.subject" />
+<meta content="servers, starting, Run on Server wizard, wizards, Run on Server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cwflow_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Which server will start</title>
</head>
-<body onresize="location.reload();" id="cwflow_wst"><a name="cwflow_wst"><!-- --></a>
+<body 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
+
+
+
+<div><p><span id="cwflow_shortdesc_ph1"><a name="cwflow_shortdesc_ph1"><!-- --></a>You can start
+the server automatically as part of running a selected resource on the server,
+or you can simply start the server without running resources on the server.
+For example, the server is automatically started when you right-click a project
+or an application resource in the Project Explorer view and select <span class="menucascade">
+<span class="uicontrol">Run As</span> > <span class="uicontrol">Run on Server</span></span>.
+If you want to start the server without running resources on the server, in
+the Servers view select a server and select the <strong>Start the server</strong></span> <img src="../images/launch_run.gif" alt="This is an image of the Run on Server icon" /> <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="This is an image of the Debug on server icon." /><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="This is an image of the Start the server in profiling mode icon." /><span id="cwflow_shortdesc_ph4"><a name="cwflow_shortdesc_ph4"><!-- --></a> icon.</span></p>
+
+<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>
+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
+<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
+is not already configured, it will be configured automatically and might 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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.dita
new file mode 100644
index 0000000..377cfc7
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.dita
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
+<?Pub Inc?>
+<concept id="cwover_wst" xml:lang="en-us">
+<title id="cwover_title">Testing and publishing on your server</title>
+<shortdesc id="cwover_shortdesc"><ph id="cwover_shortdesc_ph1">The testing
+and publishing tools provides runtime environments where you can test JSP
+files, servlets, HTML files,</ph> <ph id="cwover_shortdesc_ph2">and <tm tmclass="special"
+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes.</ph></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>testing</indexterm><indexterm>publishing</indexterm></indexterm>
+<indexterm>JSP files<indexterm>testing and publishing on a server</indexterm></indexterm>
+<indexterm>servlets<indexterm>testing and publishing on a server</indexterm></indexterm>
+<indexterm>Dynamic Web projects<indexterm>testing and publishing on a server</indexterm></indexterm>
+<indexterm>Static Web projects<indexterm>testing and publishing on a server</indexterm></indexterm>
+<indexterm>Enterprise Applications projects<indexterm>testing and publishing
+on a server</indexterm></indexterm><indexterm><?Pub Caret1?>Application Client
+Projects<indexterm>testing and publishing on a server</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<conbody>
+<p id="cwover_p1">You can use the workbench to test and publish resources
+from the following types of projects:</p>
+<ul id="cwover_ul1">
+<li>Dynamic Web projects, which typically contain JSP files, HTML files, servlets,
+and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm></li>
+<li>Static Web projects, which typically contain HTML files and graphic files</li>
+<li>Enterprise Applications projects, which may contain <tm tmclass="special"
+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 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_p2">After testing your application locally, you can use the
+tools to publish the application.</p>
+<section id="cwover_server_definitions"><title>Server definitions</title><p>The
+server tools use <varname>servers</varname> 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></section>
+</conbody>
+</concept>
+<?Pub *0000002714?>
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
index 61f279c..4802744 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html
@@ -1,44 +1,66 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Testing and publishing on your server" />
+<meta name="abstract" content="The testing and publishing tools provides runtime environments where you can test JSP files, servlets, HTML files, and Java classes." />
+<meta name="description" content="The testing and publishing tools provides runtime environments where you can test JSP files, servlets, HTML files, and Java classes." />
+<meta content="servers, testing, publishing, JSP files, testing and publishing on a server, servlets, Dynamic Web projects, Static Web projects, Enterprise Applications projects, testing and publishing on a server, Application Client Projects" name="DC.subject" />
+<meta content="servers, testing, publishing, JSP files, testing and publishing on a server, servlets, Dynamic Web projects, Static Web projects, Enterprise Applications projects, testing and publishing on a server, Application Client Projects" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cwover_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Testing and publishing on your server</title>
</head>
-<body onresize="location.reload();" id="cwover_wst"><a name="cwover_wst"><!-- --></a>
+<body 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
+
+
+
+<div><p><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
+files, servlets, HTML files,</span> <span id="cwover_shortdesc_ph2"><a name="cwover_shortdesc_ph2"><!-- --></a>and Java™ classes.</span></p>
+
+<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>
+
+<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 JavaBeans™</li>
+
<li>Static Web projects, which typically contain HTML files and graphic files</li>
-<li>Enterprise Application projects, which may contain Java Archive
+
+<li>Enterprise Applications 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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita
new file mode 100644
index 0000000..6514d82
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "concept.dtd">
+<concept id="cwres_wst" xml:lang="en-us">
+<title id="cwres_title">Resources used to test and publish on your server</title>
+<shortdesc id="cwres_shortdesc">To test and publish on your server, you need
+to define one or more of the following resources:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>overview</indexterm><indexterm>creating
+projects</indexterm><indexterm>runtime environment<indexterm>description</indexterm></indexterm></indexterm>
+<indexterm>server projects<indexterm>overview</indexterm></indexterm><indexterm>server
+configurations<indexterm>overview</indexterm></indexterm><indexterm>preferences<indexterm>installed
+server runtime environments<indexterm>description</indexterm></indexterm></indexterm>
+<indexterm>runtime environment<indexterm>description</indexterm></indexterm>
+<indexterm>applications<indexterm>compiling</indexterm></indexterm></keywords><?Pub Caret1?>
+</metadata></prolog>
+<conbody>
+<ul id="cwres_ul">
+<li>A server</li>
+<li>An installed server runtime environment</li>
+</ul>
+<p id="cwres_p1">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>
+<section id="cwres_server_project"><title>Server Project</title><p>A <i>server
+project</i> contains servers and server configuration files. When a server
+project is created automatically by the workbench, the name given to the project
+is <uicontrol>Servers</uicontrol> and is available in the Project Explorer
+view under the Other Projects folder.</p></section>
+<section id="cwres_servers"><title id="cwres_servers_title">Server</title><p
+id="cwres_servers_p1">A <i>server</i> 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_servers_p2">On
+the workbench, when the metadata of the server is automatically created, it
+is stored in a <i>serverName</i>.server file, where <i>serverName</i> is the
+name assigned to the server. For details on the metadata of the server, refer
+to the <i>Displaying or hiding the metadata of the server</i> link at the
+bottom of this topic.</p></section>
+<section><title id="cwres_serverconfig_title">Server configurations</title><p
+id="cwres_serverconfig_p1"><ph>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.</ph></p><p id="cwres_serverconfig_p2">On
+the workbench, the metadata of the server configurations is automatically
+created and stored in a <i>configuration data folder</i> under a server project.
+The naming convention of the configuration data folder is dependant on the
+vendor, typically it has the following convention: <i>serverName</i>@<i>hostname</i>-config,
+where <i>serverName</i> is the name assigned to the server, and <i>hostname</i> is
+the fully qualified DNS name or IP address of the host machine where the server
+is running.</p></section>
+<section id="cwres_installed_runtime"><title>Installed Server Runtime Environment</title>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 <i>Defining the installed server
+runtime environments</i> link at the bottom of this topic.</section>
+<section id="cwres_relationship"><title>Relationship between the resources</title><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 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 from one or more server configurations.</p></section>
+</conbody>
+</concept>
+<?Pub *0000004654?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
index 321eee1..f22c024 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html
@@ -1,37 +1,53 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Resources used to test and publish on your server" />
+<meta name="abstract" content="To test and publish on your server, you need to define one or more of the following resources:" />
+<meta name="description" content="To test and publish on your server, you need to define one or more of the following resources:" />
+<meta content="servers, overview, creating projects, runtime environment, description, server projects, server configurations, preferences, installed server runtime environments, applications, compiling" name="DC.subject" />
+<meta content="servers, overview, creating projects, runtime environment, description, server projects, server configurations, preferences, installed server runtime environments, applications, compiling" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cwres_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Resources used to test and publish on your server</title>
</head>
-<body onresize="location.reload();" id="cwres_wst"><a name="cwres_wst"><!-- --></a>
+<body 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>
+
+
+
+<div><p>To test and publish on your server, you need
+to define one or more of the following resources:</p>
+
+<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
+
+<div class="section" id="cwres_wst__cwres_servers"><a name="cwres_wst__cwres_servers"><!-- --></a><h4 class="sectiontitle">Server</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;
@@ -43,6 +59,7 @@
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
@@ -56,28 +73,27 @@
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>
+be pointed 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>
+one or more projects. A project can be pointed 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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita
new file mode 100644
index 0000000..10a35b2
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
+<?Pub Inc?>
+<reference id="rwrcview_wst" xml:lang="en-us">
+<title id="rwrcview_title">Servers view</title>
+<shortdesc><ph id="rwrcview_ph1">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,</ph><ph id="rwrcview_ph2"> restart,
+or stop the servers.</ph></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>views<indexterm>Servers</indexterm></indexterm>
+<indexterm>servers<indexterm>displaying status</indexterm><indexterm>displaying
+state</indexterm><indexterm>displaying configurations</indexterm><indexterm>managing
+using the Servers view</indexterm></indexterm><indexterm>Servers view</indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section><p> <image alt="This is a screen capture of the Server view." href="../images/scpview.gif">
+<alt>This is a screen capture of the Server view.</alt></image> </p><p id="rwrcview_p2">Use
+the Servers view to perform the following tasks:</p><ul>
+<li id="rwrcview_li1">Create a server</li>
+<li id="rwrcview_li2">Edit a server</li>
+<li id="rwrcview_li3">Delete a server</li>
+<li id="rwrcview_li4">Start a server in debug mode</li>
+<li id="rwrcview_li5">Start a server </li>
+<li id="rwrcview_li6">Restart a server in debug mode</li>
+<li id="rwrcview_li7">Restart a server</li>
+<li id="rwrcview_li8">Stop a server</li>
+<li id="rwrcview_li10">Publish your application</li>
+<li id="rwrcview_li11">Monitor server ports</li>
+<li id="rwrcview_li11b">Displaying or hiding the metadata of the server from
+the workbench</li>
+<li id="rwrcview_li12">Add and remove projects from a server</li>
+</ul><p id="rwrcview_p3">The Servers view displays the current status of all
+the servers. The <b>Status</b> column indicates whether or not a server has
+been started. The following lists the possible server status:</p><ul>
+<li id="rwrcview_ul2li1">Starting</li>
+<li id="rwrcview_ul2li2">Started</li>
+<li id="rwrcview_ul2li3">Debugging</li>
+<li id="rwrcview_ul2li4">Stopping</li>
+<li id="rwrcview_ul2li5">Stopped</li>
+</ul><p id="rwrcview_p4">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 <b>State</b> 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 <uicontrol>Automatically restart servers when necessary</uicontrol> check
+box has been selected on the Server preferences page ( <uicontrol>Window >
+Preferences > Server > Launching</uicontrol><?Pub Caret1?>), the server tools
+automatically restart that server. The <uicontrol>Status</uicontrol> column
+in the Servers view changes from <varname>Started</varname> to <varname>Stopped</varname> to
+ <varname>Started</varname>. However, if this check box is not selected, the
+ <uicontrol>State</uicontrol> column in the Servers view changes to <varname>Republish</varname>.</p><p
+id="rwrcview_p5">The following table lists the possible server states:</p><table
+id="rwrcview_table"><title>Description of server states</title>
+<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
+<thead>
+<row>
+<entry> Server states </entry>
+<entry> Description of states </entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Synchronized</entry>
+<entry>Both the server and the applications are in synch.</entry>
+</row>
+<row>
+<entry colname="COLSPEC0">Publishing</entry>
+<entry colname="COLSPEC1">Files (projects, resource files, and server configurations)
+are copied to the correct location for the server to find and use them.</entry>
+</row>
+<row>
+<entry>Restart</entry>
+<entry>The server needs to be restarted in order for the changes to take place.</entry>
+</row>
+<row>
+<entry>Republish</entry>
+<entry> Either the server or the applications or both have changed. The changed
+files need to be republished.</entry>
+</row>
+<row>
+<entry>Restart and republish</entry>
+<entry> Either the server or the applications or both have changed. When the
+server is restarted, the changed files are also republished.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></section>
+</refbody>
+</reference>
+<?Pub *0000004579?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
index f796321..911af08 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html
@@ -1,97 +1,155 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="reference" name="DC.Type" />
+<meta name="DC.Title" content="Servers view" />
+<meta name="abstract" content="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." />
+<meta name="description" content="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." />
+<meta content="views, Servers, servers, displaying status, displaying state, displaying configurations, managing using the Servers view, Servers view" name="DC.subject" />
+<meta content="views, Servers, servers, displaying status, displaying state, displaying configurations, managing using the Servers view, Servers view" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="rwrcview_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Servers view</title>
</head>
-<body onresize="location.reload();" id="rwrcview_wst"><a name="rwrcview_wst"><!-- --></a>
+<body id="rwrcview_wst"><a name="rwrcview_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Servers view</h1>
-<div><div>The Servers view (similar to the one shown
+
+
+
+<div><p><span id="rwrcview_ph1"><a name="rwrcview_ph1"><!-- --></a>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>
+can use this view to start, start in debug mode,</span><span id="rwrcview_ph2"><a name="rwrcview_ph2"><!-- --></a> restart,
+or stop the servers.</span></p>
+
+<div class="section"><p> <img src="../images/scpview.gif" alt="This is a screen capture of the Server view." /> </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>
+<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
+<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
+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
+Preferences > Server > Launching</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>
+<div class="tablenoborder"><a name="rwrcview_wst__rwrcview_table"><!-- --></a><table summary="" cellspacing="0" cellpadding="4" 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="N10176"> Server states </th>
+
+<th valign="top" id="N1017D"> 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>
+
+<tbody>
+<tr>
+<td valign="top" headers="N10176 ">Synchronized</td>
+
+<td valign="top" headers="N1017D ">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)
+
+<tr>
+<td valign="top" headers="N10176 ">Publishing</td>
+
+<td valign="top" headers="N1017D ">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>
+<td valign="top" headers="N10176 ">Restart</td>
+
+<td valign="top" headers="N1017D ">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
+
+<tr>
+<td valign="top" headers="N10176 ">Republish</td>
+
+<td valign="top" headers="N1017D "> 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
+
+<tr>
+<td valign="top" headers="N10176 ">Restart and republish</td>
+
+<td valign="top" headers="N1017D "> 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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.dita
new file mode 100644
index 0000000..ad8effb
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.dita
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "reference.dtd">
+<reference id="rwtcpvw_wst" xml:lang="en-us">
+<title id="title">TCP/IP Monitor view</title>
+<shortdesc id="shortdesc">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 <uicontrol>Show TCP/IP Monitor view when there is activity</uicontrol> check
+box on the TCPIP/IP Monitor preferences page ( <menucascade><uicontrol>Window </uicontrol>
+<uicontrol>Run/Debug</uicontrol><uicontrol>TCP/IP Monitor</uicontrol></menucascade>).</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>views<indexterm>TCP/IP Monitor</indexterm></indexterm>
+<indexterm>TCP/IP<indexterm>monitoring requests and responses</indexterm></indexterm>
+<indexterm>servers<indexterm>monitoring requests and responses to and from
+Web browser</indexterm><indexterm>TCP/IP monitoring</indexterm></indexterm>
+<indexterm>Web browsers<indexterm>monitoring requests and responses to and
+from servers</indexterm><indexterm>TCP/IP monitoring</indexterm><?Pub Caret?></indexterm>
+<indexterm>JSP files<indexterm>TCP/IP monitoring</indexterm></indexterm><indexterm>servlets<indexterm>TCP/IP
+monitoring</indexterm></indexterm><indexterm>URLs<indexterm>TCP/IP monitoring</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section id="section"><p>You can monitor the TCP/IP activity using the TCP/IP
+Monitor view (<menucascade><uicontrol>Window</uicontrol><uicontrol>Show View</uicontrol>
+<uicontrol>Other</uicontrol><uicontrol>Debug</uicontrol><uicontrol>TCP/IP
+Monitor</uicontrol></menucascade>). 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
+contains information about the request when it is forwarded to the application
+server.</li>
+<li>Response pane. Located on the right side of the TCP/IP Monitor view, this
+pane contains information about the response when it is received from the
+application server.</li>
+</ul><p>In the List of Requests pane, requests such as JSP files, servlets,
+and URLs are grouped and displayed by the host machine. Selecting a request
+displays the appropriate information about the request in the Request pane
+and the Response pane. The <i>response time</i> is the elapsed time that
+it takes for a request to arrive at the TCP/IP Monitor until the response
+is forwarded from the server.</p></section>
+</refbody>
+</reference>
+<?Pub *0000002803?>
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 f6db1a4..894b4c3 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,40 +1,54 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="reference" name="DC.Type" />
+<meta name="DC.Title" content="TCP/IP Monitor view" />
+<meta name="abstract" content="The TCP/IP Monitor is a simple server that monitors all the requests and the responses between a Web browser and server. If you want the TCP/IP Monitor view to open when there is TCP/IP activity, select the Show TCP/IP Monitor view when there is activity check box on the TCPIP/IP Monitor preferences page ( Window > Run/Debug > TCP/IP Monitor)." />
+<meta name="description" content="The TCP/IP Monitor is a simple server that monitors all the requests and the responses between a Web browser and server. If you want the TCP/IP Monitor view to open when there is TCP/IP activity, select the Show TCP/IP Monitor view when there is activity check box on the TCPIP/IP Monitor preferences page ( Window > Run/Debug > TCP/IP Monitor)." />
+<meta content="views, TCP/IP Monitor, TCP/IP, monitoring requests and responses, servers, monitoring requests and responses to and from Web browser, TCP/IP monitoring, Web browsers, monitoring requests and responses to and from servers, JSP files, servlets, TCP/IP monitoring, URLs" name="DC.subject" />
+<meta content="views, TCP/IP Monitor, TCP/IP, monitoring requests and responses, servers, monitoring requests and responses to and from Web browser, TCP/IP monitoring, Web browsers, monitoring requests and responses to and from servers, JSP files, servlets, TCP/IP monitoring, URLs" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="rwtcpvw_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>TCP/IP Monitor view</title>
</head>
-<body onresize="location.reload();" id="rwtcpvw_wst"><a name="rwtcpvw_wst"><!-- --></a>
+<body id="rwtcpvw_wst"><a name="rwtcpvw_wst"><!-- --></a>
+
<h1 class="topictitle1">TCP/IP Monitor view</h1>
-<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 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,
+
+
+
+<div><p>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 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>).</p>
+
+<div class="section" id="rwtcpvw_wst__section"><a name="rwtcpvw_wst__section"><!-- --></a><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
contains information about the request when it is forwarded to the application
server.</li>
+
<li>Response pane. Located on the right side of the TCP/IP Monitor view, this
pane contains information about the response when it is received from the
application server.</li>
+
</ul>
<p>In the List of Requests pane, requests such as JSP files, servlets,
and URLs are grouped and displayed by the host machine. Selecting a request
@@ -43,14 +57,9 @@
it takes for a request to arrive at the TCP/IP Monitor until the response
is forwarded from the server.</p>
</div>
+
</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>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.dita
new file mode 100644
index 0000000..0237490
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.dita
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
+ "topic.dtd">
+<topic id="tcreate_wst" xml:lang="en-us">
+<title id="title">Creating, editing, and deleting servers</title>
+<shortdesc></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>creating</indexterm><indexterm>editing</indexterm><indexterm>deleting</indexterm></indexterm>
+</keywords><?Pub Caret1?>
+</metadata></prolog>
+<body></body>
+</topic>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
index 9836a2d..b95966e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html
@@ -1,36 +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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="topic" name="DC.Type" />
+<meta name="DC.Title" content="Creating, editing, and deleting servers" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="servers, creating, editing, deleting" name="DC.subject" />
+<meta content="servers, creating, editing, deleting" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tcreate_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Creating, editing, and deleting servers</title>
</head>
-<body onresize="location.reload();" id="tcreate_wst"><a name="tcreate_wst"><!-- --></a>
+<body 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><p />
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.dita
new file mode 100644
index 0000000..77ab692
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.dita
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tdbgjsp_wst" xml:lang="en-us">
+<title id="tdbgjsp_title">Debugging a JSP file on a server</title>
+<shortdesc id="tdbgjsp_shortdesc">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. </shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>JSP files<indexterm>debugging on a server</indexterm></indexterm>
+<indexterm>servers<indexterm>debugging JSP files</indexterm></indexterm></keywords><?Pub Caret1?>
+</metadata></prolog>
+<taskbody>
+<context id="tdbgjsp_context">To debug a JSP file on a server:</context>
+<steps>
+<step id="tdbgjsp_step1"><cmd>In the Project Explorer view, open your JSP
+file.</cmd><info>In a Web project, JSP files are located in the Web Content
+folder. Double-click the JSP file, the file opens in an editor.</info></step>
+<step id="tdbgjsp_step2"><cmd>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.</cmd></step>
+<step id="tdbgjsp_step3"><cmd>From the JSP file's context menu in the Project
+Explorer view, click <uicontrol>Debug As> Debug on Server.</uicontrol> The
+workbench switches to the Debug perspective and the server is launched in
+debug mode.</cmd></step>
+<step id="tdbgjsp_step4"><cmd>In the Debug view, step through the code and
+make the necessary changes to the JSP file.</cmd><info>For detailed information
+on debugging, refer to the Debugging <tm tmclass="special" tmowner="Sun Microsystems, Inc."
+tmtype="tm" trademark="Java">Java</tm> applications documentation.</info>
+</step>
+<step id="tdbgjsp_step5"><cmd>Save the JSP file.</cmd></step>
+<step id="tdbgjsp_step6"><cmd>Click the <uicontrol>Refresh</uicontrol> icon
+in the Web Browser to update the changes.</cmd><info>The state of your application
+is not lost and the server recognizes your changes.</info></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000002336?>
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 43577a8..a8fe6b5 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,57 +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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Debugging a JSP file on a server" />
+<meta name="abstract" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a JavaServer Pages (JSP) without losing the state of your application." />
+<meta name="description" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a JavaServer Pages (JSP) without losing the state of your application." />
+<meta content="JSP files, debugging on a server, servers, debugging JSP files" name="DC.subject" />
+<meta content="JSP files, debugging on a server, servers, debugging JSP files" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tdbgjsp_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Debugging a JSP file on a server</title>
</head>
-<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>
+<body id="tdbgjsp_wst"><a name="tdbgjsp_wst"><!-- --></a>
+
<h1 class="topictitle1">Debugging a JSP file on a server</h1>
-<div><div>The debugger enables you to detect and diagnose
+
+
+
+<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. </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
+(JSP) without losing the state of your application. </p>
+
+<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
+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="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>
+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>
-<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>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.dita
new file mode 100644
index 0000000..8a029e0
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.dita
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tdebug_wst" xml:lang="en-us">
+<title id="title">Debugging applications on a server</title>
+<shortdesc></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<?Pub Caret?><indexterm>debugging applications</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody></taskbody>
+</task>
+<?Pub *0000000489?>
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 8f7bc07..1936a62 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,40 +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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Debugging applications on a server" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="servers, debugging applications" name="DC.subject" />
+<meta content="servers, debugging applications" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tdebug_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Debugging applications on a server</title>
</head>
-<body onresize="location.reload();" id="tdebug_wst"><a name="tdebug_wst"><!-- --></a>
+<body id="tdebug_wst"><a name="tdebug_wst"><!-- --></a>
+
<h1 class="topictitle1">Debugging applications on a server</h1>
-<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><p />
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita
new file mode 100644
index 0000000..d918443
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="testing_wst" xml:lang="en-us">
+<title id="testing_title">Testing artifacts on a server</title>
+<shortdesc id="testing_shortdesc">You can use the workbench to test one or
+more application artifacts on a server.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>testing artifacts</indexterm></indexterm>
+<indexterm>artifacts<indexterm>testing on server</indexterm></indexterm><indexterm>wizards<indexterm>Run
+on Server</indexterm></indexterm><indexterm>Run on Server wizard</indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<prereq></prereq>
+<context></context>
+<steps>
+<step id="testing_step1"><cmd>In the Project Explorer view from the J2EE perspective,
+expand the project that contains the file you want to test.</cmd></step>
+<step id="testing_step2"><cmd>Right-click the artifact that you want to test.</cmd>
+<info>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.</info>
+</step>
+<step id="testing_step3"><cmd>Select <uicontrol>Run As > Run on Server</uicontrol>.
+The Server selection wizard appears.</cmd></step>
+<step id="testing_step4"><cmd>Use the radio buttons to specify how you want
+to select the server. Select from the following options:</cmd>
+<choicetable>
+<chrow><choption>Choose an existing server</choption><chdesc>This option uses
+an existing server that is defined in your workbench. </chdesc></chrow>
+<chrow><choption>Manually define a server</choption><chdesc>This option creates
+a new server.</chdesc></chrow>
+</choicetable>
+</step>
+<step id="testing_step5"><cmd>Under the <uicontrol>Select the server that
+you want to use</uicontrol> list, select a server you want to run your application.</cmd>
+<info>The list of available servers, under the <uicontrol>Select the server
+that you want to use</uicontrol> list, depends on the J2EE specification level
+you defined for the artifact and the supported servers on this workbench.</info>
+</step>
+<step id="testing_step6"><cmd>(Optional) Click <uicontrol>Next</uicontrol> to
+configure additional settings, such as configuring settings specific to the
+server, and adding or removing projects configured on the server.</cmd></step>
+<step><cmd><ph id="testing_step7_ph1">Click <uicontrol>Finish.</uicontrol></ph></cmd>
+<info><ph id="testing_step7_ph2">The server tools automatically complete the
+following tasks for you: </ph><ul>
+<li id="testing_li1">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 <uicontrol>Servers</uicontrol> as
+the default name to hold the generated server configuration files.</li>
+<li id="testing_li2">Creates the server and adds it to the Servers View.</li>
+<li id="testing_li3">Adds your project to the server.</li>
+<li id="testing_li4">Starts the server. (This may take time depending on the
+server settings.)</li>
+<li id="testing_li5">If the <uicontrol>Automatically publish when starting
+servers</uicontrol> check box on the Server preferences page (<menucascade>
+<uicontrol>Window > Preferences > Server > Launching<?Pub Caret?></uicontrol>
+</menucascade>) 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_li6">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></info></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000003825?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
index 17b4737..328b2dd 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html
@@ -1,79 +1,115 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Testing artifacts on a server" />
+<meta name="abstract" content="You can use the workbench to test one or more application artifacts on a server." />
+<meta name="description" content="You can use the workbench to test one or more application artifacts on a server." />
+<meta content="servers, testing artifacts, artifacts, testing on server, wizards, Run on Server, Run on Server wizard" name="DC.subject" />
+<meta content="servers, testing artifacts, artifacts, testing on server, wizards, Run on Server, Run on Server wizard" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="testing_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Testing artifacts on a server</title>
</head>
-<body onresize="location.reload();" id="testing_wst"><a name="testing_wst"><!-- --></a>
+<body 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,
+
+
+
+<div><p>You can use the workbench to test one or
+more application artifacts on a server.</p>
+
+<div class="p" />
+
+<div class="section" />
+
+<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_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
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N1009E-option" align="left">Option</th>
+<th valign="bottom" id="N1009E-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N1009E-option" id="N100A8"><strong>Choose an existing server</strong></td>
+<td valign="top" headers="N1009E-desc N100A8">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
+
+<tr><td valign="top" headers="N1009E-option" id="N100B7"><strong>Manually define a server</strong></td>
+<td valign="top" headers="N1009E-desc N100B7">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
+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>
+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
+
+<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_li5"><a name="testing_wst__testing_li5"><!-- --></a>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 > Preferences > Server > Launching</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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.dita
new file mode 100644
index 0000000..ed8ec3e
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.dita
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tj2ee_wst" xml:lang="en-us">
+<title id="title">Testing applications on a server</title>
+<shortdesc id="shortdesc">You can use the workbench to test one or more projects
+on a server. </shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>testing applications</indexterm></indexterm>
+<indexterm>applications<indexterm>testing on server<?Pub Caret?></indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody></taskbody>
+</task>
+<?Pub *0000000643?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
index dc0d613..38c0b68 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html
@@ -1,30 +1,35 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Testing applications on a server" />
+<meta name="abstract" content="You can use the workbench to test one or more projects on a server." />
+<meta name="description" content="You can use the workbench to test one or more projects on a server." />
+<meta content="servers, testing applications, applications, testing on server" name="DC.subject" />
+<meta content="servers, testing applications, applications, testing on server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tj2ee_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Testing applications on a server</title>
</head>
-<body onresize="location.reload();" id="tj2ee_wst"><a name="tj2ee_wst"><!-- --></a>
+<body 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><p>You can use the workbench to test one or more projects
+on a server. </p>
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.dita
new file mode 100644
index 0000000..d0976e3
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.dita
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tlimits_wst" xml:lang="en-us">
+<title id="title">Limitations and restrictions</title>
+<shortdesc id="shortdesc"><?Pub Caret?>This section describes known server
+tools limitations and problems along with their solutions.</shortdesc>
+<taskbody>
+<context></context>
+</taskbody>
+</task>
+<?Pub *0000000465?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita
new file mode 100644
index 0000000..a763fb3
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
+<task id="tmetasrv_wst" xml:lang="en-us">
+<title id="tmetasrv_wst_title">Displaying or hiding the metadata of the server</title>
+<shortdesc id="tmetasrv_wst_shortdesc">On the workbench, you have the option
+to display or hide the metadata of the server.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>displaying metadata</indexterm><indexterm>hiding
+metadata</indexterm></indexterm><indexterm>workbench<indexterm>displaying
+server metadata</indexterm><indexterm>hiding server metadata</indexterm></indexterm>
+<indexterm>serverName.server file<indexterm>displaying on workbench</indexterm><indexterm>hiding
+from workbench<?Pub Caret?></indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context id="tmetasrv_wst_context"><p id="tmetasrv_wst_p1">The <i>metadata</i> 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></p><p id="tmetasrv_wst_p2">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 <i>serverName</i>.server file, where <i>serverName</i> is the name assigned
+to the server. The <i>serverName</i>.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:</context>
+<steps id="tmetasrv_wst_steps">
+<step id="tmetasrv_step1"><cmd>In the Servers view, right-click the server
+you want to display the metadata.</cmd></step>
+<step id="tmetasrv_step2"><cmd>Select the <uicontrol>Move to Workspace</uicontrol> option.</cmd>
+<info><note type="tip">If the <uicontrol>Move to Workspace</uicontrol> option
+is not available and you only see the <uicontrol>Move to Metadata</uicontrol> 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.</note></info></step>
+<step id="tmetasrv_step3"><cmd>In the Project Explorer view, expand the <b>Others
+Project</b> folder and then expand your server project to locate the <i>serverName</i>.server
+file, where <i>serverName</i> is the name assigned to your server.</cmd></step>
+<step id="tmetasrv_step4"><cmd>(<b>Optional</b>) You can double click <i>serverName</i>.server
+file to edit the server's data in the server editor.</cmd></step>
+</steps>
+<result id="tmetasrv_wst_result">To hide the metadata of the server:<p><ol>
+<li>In the Servers view, right-click the server you want to hide the metadata.</li>
+<li>Select the <uicontrol>Move to Metadata</uicontrol> option.<note type="tip">If
+the <uicontrol>Move to Metadata</uicontrol> option is not available and you
+only see the <uicontrol>Move to Workspace</uicontrol> option, this means the
+metadata of your server is already hidden from the workbench.</note></li>
+</ol></p></result>
+</taskbody>
+</task>
+<?Pub *0000003518?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
index e41b2af..2a3b995 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html
@@ -1,68 +1,93 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Displaying or hiding the metadata of the server" />
+<meta name="abstract" content="On the workbench, you have the option to display or hide the metadata of the server." />
+<meta name="description" content="On the workbench, you have the option to display or hide the metadata of the server." />
+<meta content="servers, displaying metadata, hiding metadata, workbench, displaying server metadata, hiding server metadata, serverName.server file, displaying on workbench, hiding from workbench" name="DC.subject" />
+<meta content="servers, displaying metadata, hiding metadata, workbench, displaying server metadata, hiding server metadata, serverName.server file, displaying on workbench, hiding from workbench" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tmetasrv_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Displaying or hiding the metadata of the server</title>
</head>
-<body onresize="location.reload();" id="tmetasrv_wst"><a name="tmetasrv_wst"><!-- --></a>
+<body 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>
+
+
+
+<div><p>On the workbench, you have the option
+to display or hide the metadata of the server.</p>
+
+<div class="section" id="tmetasrv_wst__tmetasrv_wst_context"><a name="tmetasrv_wst__tmetasrv_wst_context"><!-- --></a><div class="p" id="tmetasrv_wst__tmetasrv_wst_p1"><a name="tmetasrv_wst__tmetasrv_wst_p1"><!-- --></a>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
+<p id="tmetasrv_wst__tmetasrv_wst_p2"><a name="tmetasrv_wst__tmetasrv_wst_p2"><!-- --></a>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>
+
+<a name="tmetasrv_wst__tmetasrv_wst_steps"><!-- --></a><ol id="tmetasrv_wst__tmetasrv_wst_steps">
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step1"><a name="tmetasrv_wst__tmetasrv_step1"><!-- --></a><span>In the Servers view, right-click the server
+you want to display the metadata.</span></li>
+
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step2"><a name="tmetasrv_wst__tmetasrv_step2"><!-- --></a><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
+
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step3"><a name="tmetasrv_wst__tmetasrv_step3"><!-- --></a><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
+
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step4"><a name="tmetasrv_wst__tmetasrv_step4"><!-- --></a><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>
+
+<div class="section" id="tmetasrv_wst__tmetasrv_wst_result"><a name="tmetasrv_wst__tmetasrv_wst_result"><!-- --></a>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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.dita
new file mode 100644
index 0000000..8322e03
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.dita
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tpref_wst" xml:lang="en-us">
+<title id="tpref_title">Defining server preferences</title>
+<shortdesc id="tpref_shortdesc">The server tools allow you to define the following
+preferences:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>defining preferences</indexterm></indexterm>
+<indexterm>preferences<indexterm>servers</indexterm></indexterm><?Pub Caret1?>
+</keywords>
+</metadata></prolog>
+<taskbody></taskbody>
+</task>
+<?Pub *0000000635?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
index c534e19..8b8db95 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html
@@ -1,42 +1,35 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining server preferences" />
+<meta name="abstract" content="The server tools allow you to define the following preferences:" />
+<meta name="description" content="The server tools allow you to define the following preferences:" />
+<meta content="servers, defining preferences, preferences" name="DC.subject" />
+<meta content="servers, defining preferences, preferences" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tpref_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Defining server preferences</title>
</head>
-<body onresize="location.reload();" id="tpref_wst"><a name="tpref_wst"><!-- --></a>
+<body 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><p>The server tools allow you to define the following
+preferences:</p>
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.dita
new file mode 100644
index 0000000..f1ae29a
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.dita
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tprefaud_wst" xml:lang="en-us">
+<title id="title">Defining the audio preferences<?Pub Caret?></title>
+<shortdesc id="shortdesc">Using the Preferences page, you can define the preferences
+that servers will use for audio purposes.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>preferences<indexterm>audio for servers</indexterm></indexterm>
+<indexterm>audio<indexterm>defining preferences for servers</indexterm></indexterm>
+<indexterm>workbench<indexterm>defining audio preferences for servers</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context">To define these preferences, do the following:</context>
+<steps id="steps">
+<step><cmd>From the Window menu, select <uicontrol>Preferences</uicontrol>.</cmd>
+</step>
+<step><cmd>In the Preferences window, expand <uicontrol>Server</uicontrol> and
+then select <uicontrol>Audio.</uicontrol></cmd></step>
+<step><cmd>Specify one or more of the following settings:</cmd>
+<choicetable>
+<chrow><choption>Enable sounds</choption><chdesc>Plays sound when an error
+occurs on the server, or whenever the server changes state (such as, changing
+from "Starting" to "Started")</chdesc></chrow>
+<chrow><choption>Volume</choption><chdesc>Adjusts the volume of the sound
+played on your computer.</chdesc></chrow>
+<chrow><choption>Sounds</choption><chdesc>Lists the sounds events to which
+you can enable the sound. To enable sound for an event, select the check box
+beside the event.</chdesc></chrow>
+</choicetable>
+</step>
+<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
+save your changes.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000001836?>
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 d2548ef..278e16d 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,56 +1,77 @@
-<?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">
+<?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 audio preference</title>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining the audio preferences" />
+<meta name="abstract" content="Using the Preferences page, you can define the preferences that servers will use for audio purposes." />
+<meta name="description" content="Using the Preferences page, you can define the preferences that servers will use for audio purposes." />
+<meta content="preferences, audio for servers, audio, defining preferences for servers, workbench, defining audio preferences for servers" name="DC.subject" />
+<meta content="preferences, audio for servers, audio, defining preferences for servers, workbench, defining audio preferences for servers" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tprefaud_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining the audio preferences</title>
</head>
-<body onresize="location.reload();" id="tprefaud_wst"><a name="tprefaud_wst"><!-- --></a>
-<h1 class="topictitle1">Defining the audio preference</h1>
-<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>
+<body id="tprefaud_wst"><a name="tprefaud_wst"><!-- --></a>
+
+
+<h1 class="topictitle1">Defining the audio preferences</h1>
+
+
+
+<div><p>Using the Preferences page, you can define the preferences
+that servers will use for audio purposes.</p>
+
+<div class="section" id="tprefaud_wst__context"><a name="tprefaud_wst__context"><!-- --></a>To define these preferences, do the following:</div>
+
+<a name="tprefaud_wst__steps"><!-- --></a><ol id="tprefaud_wst__steps">
+<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="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
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N1008F-option" align="left">Option</th>
+<th valign="bottom" id="N1008F-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N1008F-option" id="N10099"><strong>Enable sounds</strong></td>
+<td valign="top" headers="N1008F-desc N10099">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 valign="top" headers="d0e29-option" id="d0e36"><strong>Volume</strong></td>
-<td valign="top" headers="d0e29-desc d0e36">Adjusts the volume of the sound
+
+<tr><td valign="top" headers="N1008F-option" id="N100A8"><strong>Volume</strong></td>
+<td valign="top" headers="N1008F-desc N100A8">Adjusts the volume of the sound
played on your computer.</td>
</tr>
-<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
+
+<tr><td valign="top" headers="N1008F-option" id="N100B7"><strong>Sounds</strong></td>
+<td valign="top" headers="N1008F-desc N100B7">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>
+
</tbody></table>
+
</li>
+
<li><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/tpublish.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.dita
new file mode 100644
index 0000000..dfa23c4
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.dita
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tpublish_wst" xml:lang="en-us">
+<title id="title">Publishing applications to a server</title>
+<shortdesc></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>publishing applications</indexterm></indexterm>
+<indexterm>applications<indexterm>publishing to servers</indexterm></indexterm><?Pub Caret?>
+</keywords>
+</metadata></prolog>
+<taskbody></taskbody>
+</task>
+<?Pub *0000000573?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
index c44215a..ace11d5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html
@@ -1,34 +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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Publishing applications to a server" />
+<meta name="abstract" content="" />
+<meta name="description" content="" />
+<meta content="servers, publishing applications, applications, publishing to servers" name="DC.subject" />
+<meta content="servers, publishing applications, applications, publishing to servers" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tpublish_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Publishing applications to a server</title>
</head>
-<body onresize="location.reload();" id="tpublish_wst"><a name="tpublish_wst"><!-- --></a>
+<body 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><p />
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita
new file mode 100644
index 0000000..f74d780
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="tservlet_wst" xml:lang="en-us">
+<title id="tservlet_title">Debugging a servlet on a server</title>
+<shortdesc id="tservlet_shortdesc">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.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servlets<indexterm>debugging on a server</indexterm></indexterm>
+<indexterm>servers<indexterm>debugging servlets</indexterm></indexterm><indexterm>breakpoints<indexterm>adding
+to servlets</indexterm></indexterm><indexterm>threads<indexterm>suspending
+in a servlet</indexterm></indexterm><?Pub Caret?></keywords>
+</metadata></prolog>
+<taskbody>
+<context id="tservlet_context">To debug a servlet on a server:</context>
+<steps>
+<step id="tservlet_step1"><cmd>In the Project Explorer view, open your servlet.</cmd>
+<info>In a Web project, servlets are located in the JavaSource folder. The
+servlet opens in an editor.</info></step>
+<step id="tservlet_step2"><cmd>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.</cmd></step>
+<step id="tservlet_step3"><cmd>Ensure the project is associated to run on
+a server.</cmd></step>
+<step id="tservlet_step4"><cmd>Select the servlet and from the servlet's context
+menu in the Project Explorer view, click <uicontrol>Debug As > Debug on Server</uicontrol>.</cmd>
+<info>Open the Servers view to see that the server is launched.</info></step>
+<step id="tservlet_step5"><cmd>When the breakpoint is hit, the Debug view
+opens.</cmd><info>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.</info></step>
+<step id="tservlet_step6"><cmd>When you are finished debugging, remove the
+breakpoint and save the servlet.</cmd></step>
+<step id="tservlet_step7"><cmd>Click the <uicontrol>Resume</uicontrol> icon
+on the Debug toolbar to execute the servlet.</cmd></step>
+<step id="tservlet_step8"><cmd>If you have hot method replace enabled, your
+changes are already in the running application.</cmd></step>
+<step id="tservlet_step9"><cmd>If you have automatic class reloading enabled,
+which is the default setting, click the <uicontrol>Refresh</uicontrol> icon
+in the Web Browser to update the changes.</cmd><info>You do not lose the state
+of your application.</info></step>
+<step><cmd id="tservlet_cmd10">If you do not have automatic class reloading
+enabled, you lose the state of the application.</cmd><info id="tservlet_info10">To
+update the changes, restart the server.</info></step>
+</steps>
+<result id="tservlet_result"><b>Result:</b><p>The server recognizes your changes.</p></result>
+</taskbody>
+</task>
+<?Pub *0000003141?>
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 d0fbed2..34094bb 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,63 +1,85 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Debugging a servlet on a server" />
+<meta name="abstract" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application." />
+<meta name="description" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application." />
+<meta content="servlets, debugging on a server, servers, debugging servlets, breakpoints, adding to servlets, threads, suspending in a servlet" name="DC.subject" />
+<meta content="servlets, debugging on a server, servers, debugging servlets, breakpoints, adding to servlets, threads, suspending in a servlet" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tservlet_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Debugging a servlet on a server</title>
</head>
-<body onresize="location.reload();" id="tservlet_wst"><a name="tservlet_wst"><!-- --></a>
+<body id="tservlet_wst"><a name="tservlet_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Debugging a servlet on a server</h1>
-<div><div>The debugger enables you to detect and
+
+
+
+<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.</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
+on a server without losing the state of your application.</p>
+
+<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>
+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="section" id="tservlet_wst__tservlet_result"><a name="tservlet_wst__tservlet_result"><!-- --></a><strong>Result:</strong><p>The server recognizes
-your changes.</p>
+
+<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>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita
new file mode 100644
index 0000000..4ec1607
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twaddprj_wst" xml:lang="en-us">
+<title id="title">Adding projects to a server</title>
+<shortdesc id="shortdesc">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.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>adding projects</indexterm></indexterm>
+<indexterm>projects<indexterm>adding to a server<?Pub Caret?></indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context"><p>This is done by adding your project to a server:</p></context>
+<steps id="steps">
+<step><cmd>In the Servers view, right-click on the server and select <uicontrol>Add
+and remove projects</uicontrol>.</cmd></step>
+<step><cmd>In the Available projects list, select the project that you want
+to test and click <uicontrol>Add</uicontrol>.</cmd></step>
+<step><cmd>The project appears in the Configured projects list.</cmd><info>Click <uicontrol>Finish</uicontrol>.</info>
+</step>
+</steps>
+<result id="result"><note>When you select a project to add to the server,
+only the projects that are applicable to the type of server will appear.</note></result>
+</taskbody>
+</task>
+<?Pub *0000001382?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
index afd7c57..4ecee04 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html
@@ -1,39 +1,56 @@
-<?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">
+<?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" />
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Adding projects to a server" />
+<meta name="abstract" content="Once you have created a server, you need to create a relationship between the projects that contain the files you want to test and your server." />
+<meta name="description" content="Once you have created a server, you need to create a relationship between the projects that contain the files you want to test and your server." />
+<meta content="servers, adding projects, projects, adding to a server" name="DC.subject" />
+<meta content="servers, adding projects, projects, adding to a server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twaddprj_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Adding projects to a server</title>
</head>
-<body onresize="location.reload();" id="twaddprj_wst"><a name="twaddprj_wst"><!-- --></a>
+<body 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><p>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.</p>
+
+<div class="section" id="twaddprj_wst__context"><a name="twaddprj_wst__context"><!-- --></a><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
+
+<a name="twaddprj_wst__steps"><!-- --></a><ol id="twaddprj_wst__steps">
+<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>
+
+<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 class="section" id="twaddprj_wst__result"><a name="twaddprj_wst__result"><!-- --></a><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/twaddsc.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddsc.html
deleted file mode 100644
index 0936c7a..0000000
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddsc.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<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>Switching server configurations</title>
-</head>
-<body id="twaddsc"><a name="twaddsc"><!-- --></a>
-
-<h1 class="topictitle1">Switching server configurations</h1>
-<div><p>You may want to use more than one server configuration for a server.
-
-To switch a server from one configuration to another:</p><div class="skipspace"></div>
-<ol><li><span>In the Servers view, right-click on server and select
-
- <b>Switch configuration</b>.</span></li>
-<li><span></span></li>
-<li><span>Select the appropriate server configuration that you want to associate
-
-with this server.</span></li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita
new file mode 100644
index 0000000..14f4742
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twcrtins_wst" xml:lang="en-us">
+<title id="title">Creating a server</title>
+<shortdesc><ph id="shortdesc">You can create a server to identify the runtime
+environment that you want to use for testing your project resources. The term <i>creating
+a server</i> defines creating a pointer from the workbench to an existing
+installation of an application server</ph>.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>creating</indexterm><indexterm>creating
+a <?Pub Caret?>pointer</indexterm></indexterm><indexterm>wizards<indexterm>New
+Server</indexterm></indexterm><indexterm>New Server wizard</indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context">To create a server:</context>
+<steps id="steps">
+<step><cmd>In the menu bar, click <uicontrol>File > New > Other</uicontrol>. </cmd>
+</step>
+<step><cmd>Expand the <uicontrol>Server</uicontrol> folder and then select
+ <uicontrol>Server</uicontrol>.</cmd></step>
+<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd><info>The New Server wizard
+opens. This wizard defines a new server, that contains information required
+to point to a specific runtime environment for local or remote testing, or
+for publishing to an application server.</info></step>
+<step><cmd>In the <uicontrol>Server's host name</uicontrol> 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: <userinput>localhost</userinput></cmd></step>
+<step><cmd>In the <uicontrol>Select the server type</uicontrol> list, select
+the type of server or test environment where you want to publish or test your
+resources.</cmd>
+<substeps>
+<substep><cmd>(Optional) Refer to the <uicontrol>Description</uicontrol> section
+for brief details about the server you have selected.</cmd></substep>
+<substep><cmd>(Optional) In the <uicontrol>View By</uicontrol> drop-down list,
+select how you would like to display the list of available servers in the <uicontrol>Select
+the server type</uicontrol> list:</cmd><info></info></substep>
+</substeps>
+<choicetable>
+<chrow><choption>Name</choption><chdesc>Alphabetically sorts the list of available
+servers.</chdesc></chrow>
+<chrow><choption>Vendor</choption><chdesc>Categorize the list of available
+servers in vendor-specific folders.</chdesc></chrow>
+<chrow><choption>Version</choption><chdesc>Categorize the list of available
+servers in folders based on the version of the servers.</chdesc></chrow>
+<chrow><choption>Module Support</choption><chdesc>Categorize the list of available
+servers based on the supported J2EE module specification level by the server.</chdesc>
+</chrow>
+</choicetable>
+</step>
+<step><cmd>Click <uicontrol>Next</uicontrol> 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 <uicontrol>F1</uicontrol>.</cmd></step>
+<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><info>The new server
+appears in the Servers view under the <uicontrol>Server</uicontrol> column.</info>
+</step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000003376?>
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 16eb2bd..4012400 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,77 +1,111 @@
-<?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">
+<?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" />
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Creating a server" />
+<meta name="abstract" content="You can create a server to identify the runtime environment that you want to use for testing your project resources. The term creating a server defines creating a pointer from the workbench to an existing installation of an application server." />
+<meta name="description" content="You can create a server to identify the runtime environment that you want to use for testing your project resources. The term creating a server defines creating a pointer from the workbench to an existing installation of an application server." />
+<meta content="servers, creating, creating a pointer, wizards, New Server, New Server wizard" name="DC.subject" />
+<meta content="servers, creating, creating a pointer, wizards, New Server, New Server wizard" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twcrtins_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Creating a server</title>
</head>
-<body onresize="location.reload();" id="twcrtins_wst"><a name="twcrtins_wst"><!-- --></a>
+<body id="twcrtins_wst"><a name="twcrtins_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Creating a server</h1>
-<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>
+
+
+
+<div><p><span id="shortdesc"><a name="shortdesc"><!-- --></a>You can create a server to identify the runtime
+environment that you want to use for testing your project resources. The term <em>creating
+a server</em> defines creating a pointer from the workbench to an existing
+installation of an application server</span>.</p>
+
+<div class="section" id="twcrtins_wst__context"><a name="twcrtins_wst__context"><!-- --></a>To create a server:</div>
+
+<a name="twcrtins_wst__steps"><!-- --></a><ol id="twcrtins_wst__steps">
+<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="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 runtime environment for local or remote testing, or
for publishing to an application server.</li>
+
<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>
+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><ol type="a"><li class="substepexpand"><span>(Optional) Refer to the <span class="uicontrol">Description</span> section
+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
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N100F8-option" align="left">Option</th>
+<th valign="bottom" id="N100F8-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N100F8-option" id="N10102"><strong>Name</strong></td>
+<td valign="top" headers="N100F8-desc N10102">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
+
+<tr><td valign="top" headers="N100F8-option" id="N10111"><strong>Vendor</strong></td>
+<td valign="top" headers="N100F8-desc N10111">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
+
+<tr><td valign="top" headers="N100F8-option" id="N10120"><strong>Version</strong></td>
+<td valign="top" headers="N100F8-desc N10120">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
+
+<tr><td valign="top" headers="N100F8-option" id="N1012F"><strong>Module Support</strong></td>
+<td valign="top" headers="N100F8-desc N1012F">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="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>
+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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.dita
new file mode 100644
index 0000000..2297c68
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.dita
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twdelins_wst" xml:lang="en-us">
+<title id="title">Deleting a server</title>
+<shortdesc id="shortdesc">You may delete a server from the Servers view.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>deleting</indexterm></indexterm>
+<indexterm>wizards<indexterm>Delete Server</indexterm></indexterm><indexterm>Delete
+Server wizard<?Pub Caret?></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context">To delete a server:</context>
+<steps id="steps">
+<step><cmd>In the Servers view, right-click on the server that you want to
+delete.</cmd></step>
+<step><cmd>Select <b>Delete</b>. </cmd><info>The Delete Server dialog box
+opens.</info></step>
+<step><cmd>Select the <uicontrol>OK</uicontrol> button to delete the server
+from the Servers view.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000001015?>
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 04698fc..fbe8864 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,36 +1,49 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Deleting a server" />
+<meta name="abstract" content="You may delete a server from the Servers view." />
+<meta name="description" content="You may delete a server from the Servers view." />
+<meta content="servers, deleting, wizards, Delete Server, Delete Server wizard" name="DC.subject" />
+<meta content="servers, deleting, wizards, Delete Server, Delete Server wizard" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twdelins_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Deleting a server</title>
</head>
-<body onresize="location.reload();" id="twdelins_wst"><a name="twdelins_wst"><!-- --></a>
+<body id="twdelins_wst"><a name="twdelins_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Deleting a server</h1>
-<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
+
+
+
+<div><p>You may delete a server from the Servers view.</p>
+
+<div class="section" id="twdelins_wst__context"><a name="twdelins_wst__context"><!-- --></a>To delete a server:</div>
+
+<a name="twdelins_wst__steps"><!-- --></a><ol id="twdelins_wst__steps">
+<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>
+
+<li class="stepexpand"><span>Select <strong>Delete</strong>. </span> The Delete Server dialog box
+opens.</li>
+
+<li class="stepexpand"><span>Select the <span class="uicontrol">OK</span> button to delete the server
+from the Servers view.</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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita
new file mode 100644
index 0000000..8e681c0
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twedtins_wst" xml:lang="en-us">
+<title id="title">Editing a server</title>
+<shortdesc id="shortdesc">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.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>editing</indexterm><indexterm>editor<?Pub Caret?></indexterm></indexterm>
+<indexterm>editors<indexterm>server</indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context">To edit a server:</context>
+<steps id="steps">
+<step><cmd>Open a server editor, completing one of the following:</cmd>
+<choices>
+<choice>In the Servers view, double-click on the server that you want to edit.</choice>
+<choice>Right-click on the server in the Servers view, from the pop-up menu
+select <uicontrol>Open</uicontrol>. </choice>
+</choices>
+</step>
+<step><cmd>When the server editor is open on the workbench, you can save your
+changes by either selecting from the toolbar <menucascade><uicontrol>File</uicontrol>
+<uicontrol>Save</uicontrol></menucascade> or type <userinput>CTRL+S</userinput>. </cmd>
+<info><note type="tip">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.</note></info></step>
+<step><cmd>Make sure that the editor is closed before starting, restarting,
+or adding and removing modules on the server.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000001812?>
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 7e6c96b..39d19f9 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,45 +1,65 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Editing a server" />
+<meta name="abstract" content="You can edit your server using a server editor. The fields that you change are dependant on what runtime environment the server is defined to use, or whether it is defined as a local or remote server." />
+<meta name="description" content="You can edit your server using a server editor. The fields that you change are dependant on what runtime environment the server is defined to use, or whether it is defined as a local or remote server." />
+<meta content="servers, editing, editor, editors, server" name="DC.subject" />
+<meta content="servers, editing, editor, editors, server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twedtins_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Editing a server</title>
</head>
-<body onresize="location.reload();" id="twedtins_wst"><a name="twedtins_wst"><!-- --></a>
+<body id="twedtins_wst"><a name="twedtins_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Editing a server</h1>
-<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>
+
+
+
+<div><p>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.</p>
+
+<div class="section" id="twedtins_wst__context"><a name="twedtins_wst__context"><!-- --></a>To edit a server:</div>
+
+<a name="twedtins_wst__steps"><!-- --></a><ol id="twedtins_wst__steps">
+<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
+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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
new file mode 100644
index 0000000..d30a739
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
+<task id="twinstprf_wst" xml:lang="en-us">
+<title id="title">Defining the installed server runtime environments preferences</title>
+<shortdesc id="shortdesc">Using the Preferences page, you can direct the workbench
+to use a specific runtime environment of an application server for compiling
+your application. You can complete this by defining the installation directory
+of the server:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>preferences<indexterm>installed server runtime
+environments<indexterm>defining</indexterm></indexterm></indexterm><indexterm>servers<indexterm>runtime
+environment<indexterm>defining</indexterm></indexterm></indexterm><indexterm>runtime
+environment<indexterm>defining</indexterm></indexterm><indexterm>workbench<indexterm>defining
+server runtime environment</indexterm></indexterm><indexterm>wizards<indexterm>New
+Server Runtime</indexterm></indexterm><indexterm>applications<indexterm>defining
+server runtime environment</indexterm></indexterm><indexterm>New Server Runtime
+wizard</indexterm><indexterm>installed server runtime environments<indexterm>setting
+preferences<?Pub Caret?></indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<steps id="steps">
+<step><cmd>From the Window menu, select <uicontrol>Preferences</uicontrol>.</cmd>
+</step>
+<step><cmd>In the Preferences window, expand the <uicontrol>Server</uicontrol> folder
+and then select <uicontrol>Installed Runtimes</uicontrol>.</cmd><info>The
+Installed Server Runtime Environments section of the Preferences dialog is
+displayed.</info></step>
+<step><cmd importance="optional"><b>Optional: </b>Click the <uicontrol>Search</uicontrol> button.
+This searches your local directory for installed server runtime environments.
+Searching on a remote host is not supported.</cmd>
+<substeps>
+<substep><cmd>The Search for Runtimes dialog box opens. In the <uicontrol>Folder</uicontrol> field,
+browse or type the directory where you would like the workbench to start searching
+for installed server runtime environments. Click <uicontrol>OK</uicontrol>.</cmd>
+</substep>
+<substep><cmd>If a list of installations is displayed, select the desired
+target server and click <uicontrol>OK</uicontrol> in the displayed dialog;
+then click <uicontrol>OK</uicontrol> in the Preferences dialog. If no installations
+of any application servers are found, continue completing the steps for this
+task.</cmd></substep>
+</substeps>
+</step>
+<step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The New Server Runtime
+wizard opens.</info>
+<substeps>
+<substep><cmd>Select the target server runtime and click <uicontrol>Next</uicontrol>.
+The <i>product_name</i> Runtime panel is displayed.</cmd></substep>
+<substep><cmd>For <uicontrol>Installation directory</uicontrol> or <uicontrol>Location</uicontrol> field,
+type or browse to the location of the target server.</cmd><info><note type="tip">If
+you specify a false location for the target server, use the workbench to assemble
+modules and then use the application server to deploy the modules.</note></info>
+<info>If you selected the target server as <b>J2EE Runtime Library</b> (a
+generic J2EE container), specify a directory that contains <tt>.jar</tt> files
+such a <tt>\bin\lib</tt> directory for a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
+tmtype="tm" trademark="Java">Java</tm> development kit installation.</info>
+</substep>
+<substep><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><info>The target server
+name and type is added to the table in the Installed Server Runtime Environment
+section.</info></substep>
+<substep><cmd>In the Preferences dialog, click <uicontrol>OK</uicontrol>.</cmd>
+</substep>
+</substeps>
+</step>
+</steps>
+<postreq id="postreq"><p id="postreq_p1">To change the list of available target
+servers, click <b>Window > Preferences > Server > Installed Runtimes</b> to
+go to the Installed Server Runtime Environments section of the Preferences
+dialog. Use the <b>Add</b>, <b>Edit</b>, <b>Remove</b> or <b>Search</b> options
+to change the list of target servers as needed.</p><p id="postreq_p2">To change
+the target server for a module:<ol>
+<li>Right-click on the module in the Project Explorer view and click <b>Properties
+> Project Facets</b>. The Project Facets page opens.</li>
+<li>Select the <uicontrol>Add/Remove Project Facets</uicontrol> button. The
+Add/Remove Project Facets dialog box opens.</li>
+<li>Select the <uicontrol>Show Runtimes</uicontrol> button.</li>
+<li>Under the <b>Runtimes</b> table, select the target servers for the module.</li>
+</ol> </p></postreq>
+</taskbody>
+</task>
+<?Pub *0000004764?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
index f807cd9..7184905 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html
@@ -1,84 +1,116 @@
-<?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">
+<?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>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining the installed server runtime environments preferences" />
+<meta name="abstract" content="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:" />
+<meta name="description" content="Using the Preferences page, you can direct the workbench to use a specific runtime environment of an application server for compiling your application. You can complete this by defining the installation directory of the server:" />
+<meta content="preferences, installed server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, New Server Runtime wizard, installed server runtime environments, setting preferences" name="DC.subject" />
+<meta content="preferences, installed server runtime environments, defining, servers, runtime environment, workbench, defining server runtime environment, wizards, New Server Runtime, applications, New Server Runtime wizard, installed server runtime environments, setting preferences" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twinstprf_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining the installed server runtime environments preferences</title>
</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>
+<body id="twinstprf_wst"><a name="twinstprf_wst"><!-- --></a>
+
+
+<h1 class="topictitle1">Defining the installed server runtime environments preferences</h1>
+
+
+
+<div><p>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:</p>
+
+<a name="twinstprf_wst__steps"><!-- --></a><ol id="twinstprf_wst__steps">
+<li class="stepexpand"><span>From the Window menu, select <span class="uicontrol">Preferences</span>.</span>
+</li>
+
<li class="stepexpand"><span>In the Preferences window, expand the <span class="uicontrol">Server</span> folder
and then select <span class="uicontrol">Installed Runtimes</span>.</span> The
Installed Server Runtime Environments section of the Preferences dialog is
displayed.</li>
-<li class="stepexpand"><span><strong>Optional: </strong>Click <span class="uicontrol">Search</span>.
+
+<li class="stepexpand"><span><strong>Optional: </strong>Click the <span class="uicontrol">Search</span> button.
This searches your local directory for installed server runtime environments.
-Searching on a remote host is not supported.</span><ol type="a"><li><span>The Search for Runtimes dialog box opens. In the <span class="uicontrol">Folder</span> field,
+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>
+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>.
+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>
+
+ If you selected the target server as <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 class="substepexpand"><span>In the Preferences dialog, click <span class="uicontrol">OK</span>.</span>
</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 list of available target
+
+</li>
+
+</ol>
+
+<div class="section" id="twinstprf_wst__postreq"><a name="twinstprf_wst__postreq"><!-- --></a><p id="twinstprf_wst__postreq_p1"><a name="twinstprf_wst__postreq_p1"><!-- --></a>To change the list of available target
servers, click <strong>Window > 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>
-<div class="p">To change
-the target server for a module:<ol><li>Right-click on the module in the Project Explorer view and click <strong>Properties
+<div class="p" id="twinstprf_wst__postreq_p2"><a name="twinstprf_wst__postreq_p2"><!-- --></a>To change
+the target server for a module:<ol>
+<li>Right-click on the module in the Project Explorer view and click <strong>Properties
> Project Facets</strong>. The Project Facets page opens.</li>
+
<li>Select the <span class="uicontrol">Add/Remove Project Facets</span> button. The
Add/Remove Project Facets dialog box opens.</li>
+
<li>Select the <span class="uicontrol">Show Runtimes</span> button.</li>
-<li>Under the <strong>Runtimes</strong> table, select the target servers
-for the module.</li>
+
+<li>Under the <strong>Runtimes</strong> table, select the target servers for the module.</li>
+
</ol>
+ </div>
</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/twlaunchpref.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita
new file mode 100644
index 0000000..29d3d2a
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<?Pub Inc?>
+<task id="twlaunchpref_wst" xml:lang="en-us">
+<title id="title">Defining the launching preferences</title>
+<shortdesc id="shortdesc"><ph id="shortdesc_ph1">Using the Preferences page,
+you can define the preferences that the servers use when starting or switching
+server modes. Switching server modes occurs when you use the <uicontrol>Run
+on Server</uicontrol></ph><ph id="shortdesc_ph2"> or <uicontrol>Debug on Server</uicontrol> commands.</ph></shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>preferences<indexterm>launching for servers</indexterm></indexterm>
+<indexterm>servers<indexterm>launching</indexterm></indexterm><indexterm>workbench<indexterm>defining
+launching preferences for servers</indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<prereq></prereq>
+<context id="context">To define these preferences, complete the following:</context>
+<steps>
+<step id="step1"><cmd>In the toolbar, select <menucascade><uicontrol>Window</uicontrol>
+<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>
+<step id="step2"><cmd>In the Preferences window, expand <uicontrol>Server</uicontrol> and
+then select <uicontrol>Launching</uicontrol>.</cmd></step>
+<step><cmd id="step3">Specify one or more of the following settings:</cmd>
+<choicetable>
+<chrow id="chrow1"><choption>Automatically publish when starting servers</choption>
+<chdesc>Specifies that all the files should automatically be published before
+starting the server.</chdesc></chrow>
+<chrow id="chrow2"><choption>Automatically restart servers when necessary</choption>
+<chdesc>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.</chdesc></chrow>
+<chrow id="chrow3"><choption>Save dirty editors before starting server</choption>
+<chdesc>Specify the preference for saving the changes in any open server editors
+before starting the server by selecting one of the following options:<ul>
+<li>Always - specifies the workbench will automatically save any changes in
+an open server editor before starting the server</li>
+<li>Never - specifies the workbench will not save the changes in any open
+editors before starting the server</li>
+<li>Prompt - specifies the workbench to prompt you before saving any changes
+in an open server editor</li>
+</ul></chdesc></chrow>
+<chrow><choption id="choption1">When switching to a different server mode<!--context id = .spge0030--></choption>
+<chdesc><ph id="chdesc1_ph1">When switching the server to run in a different
+mode, for example using the <menucascade><uicontrol>Run As</uicontrol><uicontrol>Run
+on Server</uicontrol></menucascade></ph> <ph id="chdesc1_ph2">or <menucascade>
+<uicontrol>Debug As</uicontrol><uicontrol>Debug on Server</uicontrol></menucascade>,
+specify the next action of the server by selecting one of the following options:</ph><ul
+id="chdesc1_ul1">
+<li>Restart - specifies the workbench to stop and restart the server</li>
+<li>Continue - specifies to continue running the server in previous mode and
+ignore the change request of running in a different server mode</li>
+<li>Prompt - specifies the workbench to prompt you for the next server action
+when you switch the server to run in a different mode</li>
+</ul></chdesc></chrow>
+<chrow><choption id="choption2">When switching the server out of debug mode<!--context id = .spge0031--></choption>
+<chdesc><ph id="chdesc2_ph1">When you finish running the server in debug mode
+and switch out, for example using the <menucascade><uicontrol>Run As</uicontrol>
+<uicontrol>Run on Server</uicontrol></menucascade></ph><ph id="chdesc2_ph2"> <?Pub Caret1?>command,
+specify the next action of the server by selecting one of the following options:</ph><ul
+id="chdesc2_ul1">
+<li>Restart - specifies the workbench to stop and restart the server</li>
+<li>Disable breakpoints - specifies to clear all previously set breakpoints
+from the application and continue running the application in the newly selected
+server mode</li>
+<li>Continue - specifies to continue running the server in debug mode and
+ignore the change request of running in a different server mode</li>
+<li>Prompt - specifies the workbench to prompt you for the next server action
+when switching the server out of debug mode</li>
+</ul></chdesc></chrow>
+<chrow id="chrow4"><choption>When switching the server into debug mode, re-enable
+breakpoints<!--context id = .spge0032--></choption><chdesc>When you change
+the server mode into debug mode, for example using the <menucascade><uicontrol>Debug
+As</uicontrol><uicontrol>Debug on Server</uicontrol></menucascade> command,
+specify how to handle the breakpoints currently set in your application by
+selecting one of the following options:<ul>
+<li>Always - specifies to enable all the currently set breakpoints in your
+application and break at them</li>
+<li>Never - specifies the workbench to ignore all the breakpoints previously
+set in your application and continue running the application on the server
+in debug mode. When the workbench ignores all the breakpoints in your application,
+the behavior of the server mode is similar to using the <b>Run on Server</b> command.
+However, because the server is running in debug mode, you have the opportunity
+to enable or re-enable breakpoints in your application.</li>
+<li>Prompt - specifies the workbench will prompt you on how to handle the
+breakpoints set in your applications</li>
+</ul></chdesc></chrow>
+</choicetable>
+</step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000005697?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
new file mode 100644
index 0000000..59b6896
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en-us" xml:lang="en-us">
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining the launching preferences" />
+<meta name="abstract" content="Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands." />
+<meta name="description" content="Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands." />
+<meta content="preferences, launching for servers, servers, launching, workbench, defining launching preferences for servers" name="DC.subject" />
+<meta content="preferences, launching for servers, servers, launching, workbench, defining launching preferences for servers" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twlaunchpref_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining the launching preferences</title>
+</head>
+<body id="twlaunchpref_wst"><a name="twlaunchpref_wst"><!-- --></a>
+
+
+<h1 class="topictitle1">Defining the launching preferences</h1>
+
+
+
+<div><p><span id="shortdesc_ph1"><a name="shortdesc_ph1"><!-- --></a>Using the Preferences page,
+you can define the preferences that the servers use when starting or switching
+server modes. Switching server modes occurs when you use the <span class="uicontrol">Run
+on Server</span></span><span id="shortdesc_ph2"><a name="shortdesc_ph2"><!-- --></a> or <span class="uicontrol">Debug on Server</span> commands.</span></p>
+
+<div class="p" />
+
+<div class="section" id="twlaunchpref_wst__context"><a name="twlaunchpref_wst__context"><!-- --></a>To define these preferences, complete the following:</div>
+
+<ol>
+<li id="twlaunchpref_wst__step1"><a name="twlaunchpref_wst__step1"><!-- --></a><span>In the toolbar, select <span class="menucascade"><span class="uicontrol">Window</span>
+ > <span class="uicontrol">Preferences</span></span>.</span></li>
+
+<li id="twlaunchpref_wst__step2"><a name="twlaunchpref_wst__step2"><!-- --></a><span>In the Preferences window, expand <span class="uicontrol">Server</span> and
+then select <span class="uicontrol">Launching</span>.</span></li>
+
+<li><span id="twlaunchpref_wst__step3"><a name="twlaunchpref_wst__step3"><!-- --></a>Specify one or more of the following settings:</span>
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N100B4-option" align="left">Option</th>
+<th valign="bottom" id="N100B4-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N100B4-option" id="N100BF"><strong>Automatically publish when starting servers</strong></td>
+
+<td valign="top" headers="N100B4-desc N100BF">Specifies that all the files should automatically be published before
+starting the server.</td>
+</tr>
+
+<tr><td valign="top" headers="N100B4-option" id="N100D0"><strong>Automatically restart servers when necessary</strong></td>
+
+<td valign="top" headers="N100B4-desc N100D0">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 valign="top" headers="N100B4-option" id="N100E1"><strong>Save dirty editors before starting server</strong></td>
+
+<td valign="top" headers="N100B4-desc N100E1">Specify the preference for saving the changes in any open server editors
+before starting the server by selecting one of the following options:<ul>
+<li>Always - specifies the workbench will automatically save any changes in
+an open server editor before starting the server</li>
+
+<li>Never - specifies the workbench will not save the changes in any open
+editors before starting the server</li>
+
+<li>Prompt - specifies the workbench to prompt you before saving any changes
+in an open server editor</li>
+
+</ul>
+</td>
+</tr>
+
+<tr><td valign="top" headers="N100B4-option" id="choption1"><strong>When switching to a different server mode</strong></td>
+
+<td valign="top" headers="N100B4-desc choption1"><span id="twlaunchpref_wst__chdesc1_ph1"><a name="twlaunchpref_wst__chdesc1_ph1"><!-- --></a>When switching the server to run in a different
+mode, for example using the <span class="menucascade"><span class="uicontrol">Run As</span> > <span class="uicontrol">Run
+on Server</span></span></span> <span id="twlaunchpref_wst__chdesc1_ph2"><a name="twlaunchpref_wst__chdesc1_ph2"><!-- --></a>or <span class="menucascade">
+<span class="uicontrol">Debug As</span> > <span class="uicontrol">Debug on Server</span></span>,
+specify the next action of the server by selecting one of the following options:</span><a name="twlaunchpref_wst__chdesc1_ul1"><!-- --></a><ul id="twlaunchpref_wst__chdesc1_ul1">
+<li>Restart - specifies the workbench to stop and restart the server</li>
+
+<li>Continue - specifies to continue running the server in previous mode and
+ignore the change request of running in a different server mode</li>
+
+<li>Prompt - specifies the workbench to prompt you for the next server action
+when you switch the server to run in a different mode</li>
+
+</ul>
+</td>
+</tr>
+
+<tr><td valign="top" headers="N100B4-option" id="choption2"><strong>When switching the server out of debug mode</strong></td>
+
+<td valign="top" headers="N100B4-desc choption2"><span id="twlaunchpref_wst__chdesc2_ph1"><a name="twlaunchpref_wst__chdesc2_ph1"><!-- --></a>When you finish running the server in debug mode
+and switch out, for example using the <span class="menucascade"><span class="uicontrol">Run As</span>
+ > <span class="uicontrol">Run on Server</span></span></span><span id="twlaunchpref_wst__chdesc2_ph2"><a name="twlaunchpref_wst__chdesc2_ph2"><!-- --></a> command,
+specify the next action of the server by selecting one of the following options:</span><a name="twlaunchpref_wst__chdesc2_ul1"><!-- --></a><ul id="twlaunchpref_wst__chdesc2_ul1">
+<li>Restart - specifies the workbench to stop and restart the server</li>
+
+<li>Disable breakpoints - specifies to clear all previously set breakpoints
+from the application and continue running the application in the newly selected
+server mode</li>
+
+<li>Continue - specifies to continue running the server in debug mode and
+ignore the change request of running in a different server mode</li>
+
+<li>Prompt - specifies the workbench to prompt you for the next server action
+when switching the server out of debug mode</li>
+
+</ul>
+</td>
+</tr>
+
+<tr><td valign="top" headers="N100B4-option" id="N101A5"><strong>When switching the server into debug mode, re-enable
+breakpoints</strong></td>
+<td valign="top" headers="N100B4-desc N101A5">When you change
+the server mode into debug mode, for example using the <span class="menucascade"><span class="uicontrol">Debug
+As</span> > <span class="uicontrol">Debug on Server</span></span> command,
+specify how to handle the breakpoints currently set in your application by
+selecting one of the following options:<ul>
+<li>Always - specifies to enable all the currently set breakpoints in your
+application and break at them</li>
+
+<li>Never - specifies the workbench to ignore all the breakpoints previously
+set in your application and continue running the application on the server
+in debug mode. When the workbench ignores all the breakpoints in your application,
+the behavior of the server mode is similar to using the <strong>Run on Server</strong> command.
+However, because the server is running in debug mode, you have the opportunity
+to enable or re-enable breakpoints in your application.</li>
+
+<li>Prompt - specifies the workbench will prompt you on how to handle the
+breakpoints set in your applications</li>
+
+</ul>
+</td>
+</tr>
+
+</tbody></table>
+
+</li>
+
+</ol>
+
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.dita
new file mode 100644
index 0000000..d8228a8
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.dita
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twmanage_wst" xml:lang="en-us">
+<title id="title">Managing servers </title>
+<shortdesc id="shortdesc">You can use the server tools views to manage servers.
+The following tasks may be included as part of the development path:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><?Pub Caret?><indexterm>servers<indexterm>managing</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody></taskbody>
+</task>
+<?Pub *0000000597?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
index 6abf5fd..f71138e 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html
@@ -1,47 +1,35 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Managing servers" />
+<meta name="abstract" content="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:" />
+<meta name="description" content="You can use the server tools views to manage servers. The following tasks may be included as part of the development path:" />
+<meta content="servers, managing" name="DC.subject" />
+<meta content="servers, managing" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twmanage_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Managing servers </title>
</head>
-<body onresize="location.reload();" id="twmanage_wst"><a name="twmanage_wst"><!-- --></a>
+<body 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><p>You can use the server tools views to manage servers.
+The following tasks may be included as part of the development path:</p>
</div>
+
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita
new file mode 100644
index 0000000..4b2383a
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twprefin_wst" xml:lang="en-us">
+<title id="title">Setting a default server</title>
+<shortdesc id="shortdesc">A default server is the server that you want to
+use when a project has more than one server defined.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>setting default on a project<?Pub Caret?></indexterm></indexterm>
+<indexterm>projects<indexterm>setting a default server</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context id="context"><p>To set a default server:</p></context>
+<steps id="steps">
+<step><cmd>Right-click on your project.</cmd><info>The pop-up menu for this
+project appears.</info></step>
+<step><cmd>Select <menucascade><uicontrol>Properties </uicontrol><uicontrol>Server</uicontrol>
+</menucascade>.</cmd><info>The Server pane appears on the right.</info></step>
+<step><cmd>Under the <uicontrol>Default server</uicontrol> list, select the
+server that you want to become the default server.</cmd></step>
+<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
+save your changes and close the Properties window.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000001344?>
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 7d79a40..3d02039 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,39 +1,54 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Setting a default server" />
+<meta name="abstract" content="A default server is the server that you want to use when a project has more than one server defined." />
+<meta name="description" content="A default server is the server that you want to use when a project has more than one server defined." />
+<meta content="servers, setting default on a project, projects, setting a default server" name="DC.subject" />
+<meta content="servers, setting default on a project, projects, setting a default server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twprefin_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Setting a default server</title>
</head>
-<body onresize="location.reload();" id="twprefin_wst"><a name="twprefin_wst"><!-- --></a>
+<body id="twprefin_wst"><a name="twprefin_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Setting a default server</h1>
-<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><p>A default server is the server that you want to
+use when a project has more than one server defined.</p>
+
+<div class="section" id="twprefin_wst__context"><a name="twprefin_wst__context"><!-- --></a><p>To set a default server:</p>
</div>
-<ol><li class="stepexpand"><span>Right-click on your project.</span> The pop-up menu for this
+
+<a name="twprefin_wst__steps"><!-- --></a><ol id="twprefin_wst__steps">
+<li class="stepexpand"><span>Right-click on your project.</span> The pop-up menu for this
project appears.</li>
-<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>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="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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita
new file mode 100644
index 0000000..8314cae
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twpub_wst" xml:lang="en-us">
+<title id="twpub_title">Publishing your application</title>
+<shortdesc id="twpub_shortdesc"><i>Publishing</i> 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.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>publishing applications</indexterm></indexterm>
+<indexterm>applications<indexterm>publishing to servers</indexterm><indexterm>copying
+files to server</indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context><p id="twpub_p1">You can either publish your application automatically
+or manually. If the <uicontrol>Automatically publish when starting servers</uicontrol> check
+box on the Server preferences page (<menucascade><uicontrol>Window</uicontrol>
+<uicontrol>Preferences</uicontrol><uicontrol>Server</uicontrol><uicontrol>Launching<?Pub Caret?></uicontrol>
+</menucascade>) 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
+id="twpub_p2">To publish your application manually you can complete one of
+the following in the Servers view:</p></context>
+<steps-unordered>
+<step><cmd><ph id="twpub_steps_ph1">Select the server and then click the <uicontrol>Publish
+to the server</uicontrol></ph> <image alt="This is an image of the Publish toolbar icon."
+href="../images/launch_publish.gif"><alt>This is an image of the Publish toolbar
+icon.</alt></image> <ph id="twpub_steps_ph2">icon located on the toolbar.</ph></cmd>
+</step>
+<step id="twpub_steps_step2"><cmd>Right-click the server and then select <uicontrol>Publish</uicontrol>.</cmd>
+</step>
+</steps-unordered>
+<result><p id="twpub_p3">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></result>
+</taskbody>
+</task>
+<?Pub *0000002418?>
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 f22cd06..d78eebb 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,51 +1,65 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Publishing your application" />
+<meta name="abstract" content="Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created." />
+<meta name="description" content="Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created." />
+<meta content="servers, publishing applications, applications, publishing to servers, copying files to server" name="DC.subject" />
+<meta content="servers, publishing applications, applications, publishing to servers, copying files to server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twpub_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Publishing your application</title>
</head>
-<body onresize="location.reload();" id="twpub_wst"><a name="twpub_wst"><!-- --></a>
+<body id="twpub_wst"><a name="twpub_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Publishing your application</h1>
-<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
+
+
+
+<div><p><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.</p>
+
+<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 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>
+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 class="uicontrol">Launching</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 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><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>
+<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="This is an image of the Publish toolbar icon." /> <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>
+
<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>
-<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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.dita
new file mode 100644
index 0000000..e6d1163
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.dita
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twremprj_wst" xml:lang="en-us">
+<title id="title">Removing a project from a server</title>
+<shortdesc id="shortdesc">To remove a project from a server:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>removing projects</indexterm></indexterm>
+<indexterm>projects<indexterm>removing from a <?Pub Caret?>server</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context></context>
+<steps id="steps">
+<step><cmd>In the Servers view, right-click on the server containing the project
+you want to remove and select <uicontrol>Add and remove projects</uicontrol>.</cmd>
+</step>
+<step><cmd>In the Configured projects list, select the project and click the <uicontrol>Remove</uicontrol> button.</cmd>
+</step>
+<step><cmd>The project appears in the Available projects list. Click <uicontrol>Finish</uicontrol>.</cmd>
+</step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000001077?>
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 46a0405..c1d72c7 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,34 +1,50 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Removing a project from a server" />
+<meta name="abstract" content="To remove a project from a server:" />
+<meta name="description" content="To remove a project from a server:" />
+<meta content="servers, removing projects, projects, removing from a server" name="DC.subject" />
+<meta content="servers, removing projects, projects, removing from a server" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twremprj_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Removing a project from a server</title>
</head>
-<body onresize="location.reload();" id="twremprj_wst"><a name="twremprj_wst"><!-- --></a>
+<body id="twremprj_wst"><a name="twremprj_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Removing a project from a server</h1>
-<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>
+
+
+
+<div><p>To remove a project from a server:</p>
+
+<div class="section" />
+
+<a name="twremprj_wst__steps"><!-- --></a><ol id="twremprj_wst__steps">
+<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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.dita
new file mode 100644
index 0000000..00675e6
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.dita
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twsrtdbg_wst" xml:lang="en-us">
+<title id="twsrtdbg_title">Starting a server in debug mode</title>
+<shortdesc id="twsrtdbg_shortdesc">If you want to debug your projects while
+a server runs, you can start a server in debug mode.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<?Pub Caret?><indexterm>starting in
+debug mode</indexterm></indexterm><indexterm>applications<indexterm>running
+on a server in debug mode</indexterm></indexterm><indexterm>projects<indexterm>running
+on a server in debug mode</indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<prereq id="twsrtdbg_prereq"><b>Prerequisites:</b><ul>
+<li><xref href="twcrtins.dita">Create a server.</xref></li>
+<li><xref href="twaddprj.dita">Add a project to the server.</xref></li>
+<li>Edit the file you want to run and set breakpoints.</li>
+<li>Open the Debug perspective.</li>
+</ul></prereq>
+<context id="twsrtdbg_context"><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 <uicontrol> Status </uicontrol> 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></context>
+<steps>
+<step id="twsrtdbg_step1"><cmd>In the Servers view ( <menucascade><uicontrol>Window
+> Show View > Other > Server > Servers > OK</uicontrol></menucascade>), right-click
+the server you want to start in debug mode.</cmd></step>
+<step><cmd><ph id="twsrtdbg_steps_ph1">In the pop-up menu select <uicontrol>Debug </uicontrol> </ph> <image
+alt="This is an image of the Start in debug mode icon." href="../images/launch_debug.gif">
+<alt>This is an image of the Start in debug mode icon</alt></image> . </cmd>
+<info><ph id="twsrtdbg_steps_ph2">In the <uicontrol>Status</uicontrol> column
+of the Servers view, the status of the server changes to <i>Debugging</i>,
+after the server is started in debug mode.</ph></info></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000002269?>
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 4df13b9..9616ddf 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,29 +1,46 @@
-<?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">
+<?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" />
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Starting a server in debug mode" />
+<meta name="abstract" content="If you want to debug your projects while a server runs, you can start a server in debug mode." />
+<meta name="description" content="If you want to debug your projects while a server runs, you can start a server in debug mode." />
+<meta content="servers, starting in debug mode, applications, running on a server in debug mode, projects" name="DC.subject" />
+<meta content="servers, starting in debug mode, applications, running on a server in debug mode, projects" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twsrtdbg_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Starting a server in debug mode</title>
</head>
-<body onresize="location.reload();" id="twsrtdbg_wst"><a name="twsrtdbg_wst"><!-- --></a>
+<body id="twsrtdbg_wst"><a name="twsrtdbg_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Starting a server in debug mode</h1>
-<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>
+
+
+
+<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" 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>
+
</ul>
</div>
+
<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
@@ -33,18 +50,21 @@
start the server in debug mode:</p>
<p> </p>
</div>
-<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
+
+<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="This is an image of the Start in debug mode icon" /> . </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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita
new file mode 100644
index 0000000..c354c06
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twsrtins_wst" xml:lang="en-us">
+<title id="twsrtins_title">Starting a server</title>
+<shortdesc id="twsrtins_shortdesc">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.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>starting</indexterm></indexterm>
+<indexterm>projects<indexterm>starting server for testing</indexterm></indexterm>
+<indexterm>applications<indexterm>starting server for testing</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<prereq><b id="twsrtins_prereq">Prerequisites:</b><ul>
+<li id="twsrtins_prereq_li1"><xref href="twcrtins.dita">Create a server.</xref></li>
+</ul></prereq>
+<context id="twrstins_context"><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 <uicontrol>Status</uicontrol> column
+of the Servers view.</p><p>To manually start a server:</p></context>
+<steps id="twrtins_steps">
+<step><cmd>Switch to the Servers view.</cmd></step>
+<step><cmd>In the Servers view, right-click the server you want to start.</cmd>
+</step>
+<step><cmd>Select <uicontrol>Start</uicontrol>. </cmd><info>The following
+things happen:<ul>
+<li>If you have selected the <uicontrol>Automatically publish when starting
+servers</uicontrol> check box on the Server preferences page (<menucascade>
+<uicontrol>Window</uicontrol><uicontrol> Preferences</uicontrol><uicontrol>Server</uicontrol>
+<uicontrol>Launching<?Pub Caret?></uicontrol></menucascade> ), 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>
+<li>In the <uicontrol>Status</uicontrol> column of the Servers view, the
+status of the server changes to <systemoutput>Started</systemoutput>.</li>
+</ul></info></step>
+</steps>
+<result id="twsrtins_result"><note type="tip">The server is automatically
+started when you right-click on a file and then select <uicontrol>Run As
+> Run on Server</uicontrol>.</note></result>
+</taskbody>
+</task>
+<?Pub *0000002752?>
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 68af95b..54d5629 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,69 +1,84 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Starting a server" />
+<meta name="abstract" content="When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic." />
+<meta name="description" content="When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic." />
+<meta content="servers, starting, projects, starting server for testing, applications" name="DC.subject" />
+<meta content="servers, starting, projects, starting server for testing, applications" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twsrtins_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Starting a server</title>
</head>
-<body onresize="location.reload();" id="twsrtins_wst"><a name="twsrtins_wst"><!-- --></a>
+<body id="twsrtins_wst"><a name="twsrtins_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Starting a server</h1>
-<div><div>When you are ready to test your projects,
+
+
+
+<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.</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>
+will start, refer to the list of related topics at the end of this topic.</p>
+
+<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="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>
-<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>
+
+<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>
+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 class="uicontrol">Launching</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>
+
<li>In the <span class="uicontrol">Status</span> column of the Servers view, the
status of the server changes to <tt class="sysout">Started</tt>.</li>
+
</ul>
</li>
+
</ol>
+
<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>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita
new file mode 100644
index 0000000..cae7f32
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twsrvprf_wst" xml:lang="en-us">
+<title id="title">Defining the s<?Pub Caret?>erver preferences</title>
+<shortdesc id="shortdesc">Using the Preferences page, you can define attributes
+used for testing projects by the servers. To define these preferences, complete
+the following:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>defining preferences</indexterm><indexterm>setting
+publishing preferences</indexterm><indexterm>setting timeout delays</indexterm></indexterm>
+<indexterm>preferences<indexterm>servers</indexterm></indexterm><indexterm>views<indexterm>Servers<indexterm>preferences</indexterm></indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<steps id="steps">
+<step><cmd>In the toolbar, select <menucascade><uicontrol>Window</uicontrol>
+<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>
+<step><cmd>In the Preferences page, select <uicontrol>Server</uicontrol>.</cmd>
+</step>
+<step><cmd>Specify one or more of the following settings by selecting the
+appropriate check box:</cmd>
+<choicetable>
+<chrow><choption>Show Servers view when server state changes</choption><chdesc>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 <xref
+href="rwrcview.dita">Servers View</xref> topic.</chdesc></chrow>
+<chrow><choption>Synchronize servers on workbench startup<draft-comment>context
+id = spge0028</draft-comment></choption><chdesc><draft-comment>Review description</draft-comment>This
+option specifies that each time you start the workbench, it will try to update
+the status of the server defined in the Servers view with the actual state
+of the server, such as Started or Stopped.</chdesc></chrow>
+<chrow><choption>Automatically publish to local server</choption><chdesc>Specifies
+that all the files should automatically be published to the local server at
+every <i>seconds</i> intervals, where <i>seconds</i> is the number of seconds
+you have specified in the <uicontrol>Publishing interval (in seconds)</uicontrol> control.
+The minimum value for the publishing interval is ten seconds.</chdesc></chrow>
+<chrow><choption>Automatically publish to remote server</choption><chdesc>Specifies
+that all the files should automatically be published to the remote server
+at every <i>seconds</i> intervals, where <i>seconds</i> is the number of seconds
+you have specified in the <uicontrol>Publishing interval (in seconds)</uicontrol> control.
+The minimum value for the publishing interval is ten seconds.</chdesc></chrow>
+<chrow><choption>Prompt before making irreversible changes within an editor</choption>
+<chdesc>Specifies that the server tools will prompt you before you make a
+change in a editor that cannot be undone.</chdesc></chrow>
+</choicetable>
+</step>
+<step><cmd>Under the <uicontrol>Server timeout delay</uicontrol> drop-down
+list, select one of the following relative length of time you can wait before
+ending a server operation:</cmd>
+<choices>
+<choice>Longer</choice>
+<choice>Long</choice>
+<choice>Normal</choice>
+<choice>Short</choice>
+<choice>Shorter</choice>
+</choices>
+<info>The default setting is <uicontrol>Normal</uicontrol>.</info><info><note
+type="tip">If you have a fast processing machine, you can try using the <uicontrol>Shorter</uicontrol> timeout
+delay option. If you have a slow processing machine, you can try using the <uicontrol>Longer</uicontrol> timeout
+delay option.</note></info></step>
+<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
+save your changes.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000003817?>
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 6456489..dd396d9 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,106 +1,116 @@
-<?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">
+<?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 Server preference</title>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining the server preferences" />
+<meta name="abstract" content="Using the Preferences page, you can define attributes used for testing projects by the servers. To define these preferences, complete the following:" />
+<meta name="description" content="Using the Preferences page, you can define attributes used for testing projects by the servers. To define these preferences, complete the following:" />
+<meta content="servers, defining preferences, setting publishing preferences, setting timeout delays, preferences, views, Servers" name="DC.subject" />
+<meta content="servers, defining preferences, setting publishing preferences, setting timeout delays, preferences, views, Servers" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twsrvprf_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining the server preferences</title>
</head>
-<body onresize="location.reload();" id="twsrvprf_wst"><a name="twsrvprf_wst"><!-- --></a>
-<h1 class="topictitle1">Defining the Server preference</h1>
-<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>
+<body id="twsrvprf_wst"><a name="twsrvprf_wst"><!-- --></a>
+
+
+<h1 class="topictitle1">Defining the server preferences</h1>
+
+
+
+<div><p>Using the Preferences page, you can define attributes
+used for testing projects by the servers. To define these preferences, complete
+the following:</p>
+
+<a name="twsrvprf_wst__steps"><!-- --></a><ol id="twsrvprf_wst__steps">
+<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="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
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N1009B-option" align="left">Option</th>
+<th valign="bottom" id="N1009B-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N1009B-option" id="N100A5"><strong>Show Servers view when server state changes</strong></td>
+<td valign="top" headers="N1009B-desc N100A5">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 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><td valign="top" headers="N1009B-option" id="N100BB"><strong>Synchronize servers on workbench startup</strong></td>
+<td valign="top" headers="N1009B-desc N100BB">This
+option specifies that each time you start the workbench, it will try to update
+the status of the server defined in the Servers view with the actual state
+of the server, such as Started or Stopped.</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
+
+<tr><td valign="top" headers="N1009B-option" id="N100D4"><strong>Automatically publish to local server</strong></td>
+<td valign="top" headers="N1009B-desc N100D4">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
+
+<tr><td valign="top" headers="N1009B-option" id="N100F5"><strong>Automatically publish to remote server</strong></td>
+<td valign="top" headers="N1009B-desc N100F5">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 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
+
+<tr><td valign="top" headers="N1009B-option" id="N10116"><strong>Prompt before making irreversible changes within an editor</strong></td>
+
+<td valign="top" headers="N1009B-desc N10116">Specifies that the server tools will prompt you before you make a
change in a editor that cannot be undone.</td>
</tr>
+
</tbody></table>
+
</li>
-<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="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 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 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 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>
+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.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.dita
new file mode 100644
index 0000000..e1dfdce
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.dita
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twstpins_wst" xml:lang="en-us">
+<title id="twstpins_title">Stopping a server</title>
+<shortdesc id="twstpins_shortdesc">You can stop the server from the Servers
+view.</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>servers<indexterm>stopping</indexterm><indexterm>process
+(stopping)</indexterm><indexterm>terminating</indexterm><?Pub Caret1?></indexterm>
+</keywords>
+</metadata></prolog>
+<taskbody>
+<context id="twstpins_context">To stop the server:</context>
+<steps>
+<step id="twstpins_step1"><cmd>In the Servers view ( <b>Window > Show View
+> Other > Server > Servers > OK</b>), select the server that you want to stop.</cmd>
+</step>
+<step><cmd><ph id="twstpins_steps_ph1">Click the <uicontrol>Stop the server</uicontrol></ph> <image
+alt="This is an image of the Stop icon." href="../images/launch_stop.gif">
+<alt>This is an image of the Stop icon.</alt></image> <ph id="twstpins_steps_ph2">icon
+in the toolbar.</ph></cmd><info><ph id="twstpins_steps_ph3">In the <uicontrol>Status</uicontrol> column
+of the Servers view, the status of the server changes to <i>Stopped</i>.</ph></info>
+</step>
+<step><cmd><ph id="twstpins_steps_ph4">If for some reason the server fails
+to stop, you can terminate the process as follows:</ph></cmd>
+<substeps>
+<substep id="twstpins_steps_substep1"><cmd>Switch to the Debug perspective.</cmd>
+</substep>
+<substep id="twstpins_steps_substep2"><cmd>In the Process view, select the
+server process that you want to stop.</cmd></substep>
+<substep><cmd><ph id="twstpins_steps_ph6">Click the <uicontrol>Terminate</uicontrol></ph> <image
+alt="This is an image of the Terminate icon." href="../images/launch_stop.gif">
+<alt>This is an image of the Terminate icon</alt></image> <ph id="twstpins_steps_ph7">icon
+in the toolbar.</ph></cmd></substep>
+</substeps>
+</step>
+</steps>
+<result id="twstpins_result"><note>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.</note></result>
+</taskbody>
+</task>
+<?Pub *0000002249?>
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 1b5df41..22de0a0 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,47 +1,71 @@
-<?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">
+<?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" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Stopping a server" />
+<meta name="abstract" content="You can stop the server from the Servers view." />
+<meta name="description" content="You can stop the server from the Servers view." />
+<meta content="servers, stopping, process (stopping), terminating" name="DC.subject" />
+<meta content="servers, stopping, process (stopping), terminating" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twstpins_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Stopping a server</title>
</head>
-<body onresize="location.reload();" id="twstpins_wst"><a name="twstpins_wst"><!-- --></a>
+<body id="twstpins_wst"><a name="twstpins_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Stopping a server</h1>
-<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
+
+
+
+<div><p>You can stop the server from the Servers
+view.</p>
+
+<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="This is an image of the Stop icon." /> <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>
+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>
+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>
+
+<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="This is an image of the Terminate icon" /> <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="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>
+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>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita
new file mode 100644
index 0000000..e997a47
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
+ "task.dtd">
+<task id="twtcpprf_wst" xml:lang="en-us">
+<title id="title">Defining the TCP/IP Monitor preferences<?Pub Caret?></title>
+<shortdesc id="shortdesc">Using the Preferences page, you can define the TCP/IP
+Monitor attributes. To define these preferences, complete the following:</shortdesc>
+<prolog><metadata>
+<keywords id="index"><indexterm>preferences<indexterm>TCP/IP Monitor</indexterm></indexterm>
+<indexterm>TCP/IP<indexterm>preferences</indexterm></indexterm><indexterm>views<indexterm>TCP/IP
+Monitor<indexterm>preferences</indexterm></indexterm></indexterm></keywords>
+</metadata></prolog>
+<taskbody>
+<context></context>
+<steps id="steps">
+<step><cmd>From the toolbar, select <menucascade><uicontrol>Window</uicontrol>
+<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>
+<step><cmd>In the Preferences window, expand <uicontrol>Run/Debug</uicontrol> and
+then select <uicontrol>TCP/IP Monitor</uicontrol>.</cmd></step>
+<step><cmd>Select the <uicontrol>Show TCP/IP Monitor View when there is activity</uicontrol> check
+box if you want to display the TCP/IP Monitor view when there is activity
+through a TCP/IP monitoring server.</cmd></step>
+<step><cmd>To add a TCP/IP monitoring server, complete the following:</cmd>
+<substeps>
+<substep><cmd>Under the <uicontrol>TCP/IP Monitors</uicontrol> lists, click <uicontrol>Add</uicontrol>.</cmd>
+<info>A <uicontrol>New Monitor</uicontrol> dialog opens.</info></substep>
+<substep><cmd>Specify the following settings, then click <uicontrol>OK</uicontrol>:</cmd>
+</substep>
+</substeps>
+<choicetable>
+<chrow><choption>Local monitoring port</choption><chdesc>Specify a unique
+port number on your local machine.</chdesc></chrow>
+<chrow><choption>Host name</choption><chdesc>Specify the host name or IP address
+of the machine where the server is running.</chdesc></chrow>
+<chrow><choption>Port</choption><chdesc>Specify the port number of the remote
+server.</chdesc></chrow>
+<chrow><choption>Type</choption><chdesc>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
+in the same connection. If the TCP/IP option is selected, all the requests
+are sent byte for byte and the TCP/IP Monitor will not translate or modify
+any requests that it forwards. </chdesc></chrow>
+<chrow><choption>Connection Timeout</choption><chdesc>Specify the length of
+time, in milliseconds, that you can wait before ending the TCP/IP connection
+to a server.</chdesc></chrow>
+</choicetable>
+</step>
+<step><cmd>Use the <uicontrol>Start</uicontrol> and <uicontrol>Stop</uicontrol> buttons
+to manage the TCP/IP monitoring servers.</cmd><info>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 <b>Status</b> column shows if the TCP/IP monitor is started or
+stopped. The <b>Host name</b> column shows the host name or IP address of
+the machine where the server is running. The <b>Type</b> column shows whether
+the request type from the Web browser are sent by HTTP or TCP/IP.</info></step>
+<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
+save your changes.</cmd></step>
+</steps>
+</taskbody>
+</task>
+<?Pub *0000003580?>
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 6f6006f..a403845 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,52 +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">
+<?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 TCP/IP Monitor preference</title>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 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 http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining the TCP/IP Monitor preferences" />
+<meta name="abstract" content="Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:" />
+<meta name="description" content="Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:" />
+<meta content="preferences, TCP/IP Monitor, TCP/IP, views, TCP/IP Monitor" name="DC.subject" />
+<meta content="preferences, TCP/IP Monitor, TCP/IP, views, TCP/IP Monitor" name="keywords" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="twtcpprf_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining the TCP/IP Monitor preferences</title>
</head>
-<body onresize="location.reload();" id="twtcpprf_wst"><a name="twtcpprf_wst"><!-- --></a>
-<h1 class="topictitle1">Defining the TCP/IP Monitor preference</h1>
-<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>
+<body id="twtcpprf_wst"><a name="twtcpprf_wst"><!-- --></a>
+
+
+<h1 class="topictitle1">Defining the TCP/IP Monitor preferences</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" />
+
+<a name="twtcpprf_wst__steps"><!-- --></a><ol id="twtcpprf_wst__steps">
+<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 <span class="uicontrol">OK</span>:</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 <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="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
+
+<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
+<thead><tr><th valign="bottom" id="N100E3-option" align="left">Option</th>
+<th valign="bottom" id="N100E3-desc" align="left">Description</th></tr></thead>
+<tbody>
+<tr><td valign="top" headers="N100E3-option" id="N100ED"><strong>Local monitoring port</strong></td>
+<td valign="top" headers="N100E3-desc N100ED">Specify a unique
port number on your local machine.</td>
</tr>
-<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
+
+<tr><td valign="top" headers="N100E3-option" id="N100FC"><strong>Host name</strong></td>
+<td valign="top" headers="N100E3-desc N100FC">Specify the host name or IP address
of the machine where the server is running.</td>
</tr>
-<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
+
+<tr><td valign="top" headers="N100E3-option" id="N1010B"><strong>Port</strong></td>
+<td valign="top" headers="N100E3-desc N1010B">Specify the port number of the remote
server.</td>
</tr>
-<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
+
+<tr><td valign="top" headers="N100E3-option" id="N1011A"><strong>Type</strong></td>
+<td valign="top" headers="N100E3-desc N1011A">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
@@ -54,13 +81,17 @@
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
+
+<tr><td valign="top" headers="N100E3-option" id="N10129"><strong>Connection Timeout</strong></td>
+<td valign="top" headers="N100E3-desc N10129">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
lists the available TCP/IP monitoring servers. You can add, edit, remove,
@@ -69,17 +100,14 @@
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 <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 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>
</html>
\ No newline at end of file
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
index 8bb0f11..ae38dd7 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_create.xml
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Creating servers" topic="topics/tcreate.html">
- <topic label="Creating, editing, and deleting servers" href="topics/tcreate.html">
- <topic label="Creating a server " href="topics/twcrtins.html">
- <link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_create.xml"/>
- </topic>
- <topic label="Editing a server" href="topics/twedtins.html"/>
- <topic label="Deleting a server" href="topics/twdelins.html"/>
- </topic>
-</toc>
\ No newline at end of file
+<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
index eaa376b..33b9eca 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_debug.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Debugging applications on a server" topic="topics/tdebug.html">
- <topic label="Debugging applications on a server" href="topics/tdebug.html">
- <topic label="...servlets" href="topics/tservlet.html"/>
- <topic label="...JSP file" href="topics/tdbgjsp.html"/>
- </topic>
-</toc>
\ No newline at end of file
+<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
index 6778725..53beb3d 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -1,47 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?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 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 preferences" href="topics/twsrvprf.html"/>
- <topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
- <topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
- <topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html">
- <link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
- </topic>
- <topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
- <topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
- </topic>
- </topic>
- </topic>
-</toc>
\ No newline at end of file
+<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 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 preferences" href="topics/twsrvprf.html"/>
+<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
+<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
+<topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html">
+<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
+</topic>
+<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
+<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+</topic>
+</topic>
+</topic>
+</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
index a0e6b1f..ea73817 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_manage.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Managing Servers" topic="topics/twmanage.html">
- <topic label="Managing servers" href="topics/twmanage.html">
- <topic label="Adding projects to a server " href="topics/twaddprj.html"/>
- <topic label="Removing a project from a server" href="topics/twremprj.html"/>
- <topic label="Starting a server" href="topics/twsrtins.html">
- <topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
- </topic>
- <topic label="Stopping a server" href="topics/twstpins.html"/>
- <topic label="Setting a default server" href="topics/twprefin.html"/>
- <topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
- </topic>
-</toc>
\ No newline at end of file
+<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
index b5dfa24..ae98e95 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_pref.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Server Preferences" topic="topics/tpref.html">
- <topic label="Defining server preferences" href="topics/tpref.html">
- <topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
- <topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
- <topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
- <topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html">
- <link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
- </topic>
- <topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
- <topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
- </topic>
- </topic>
-</toc>
\ No newline at end of file
+<topic label="Defining server preferences" href="topics/tpref.html">
+<topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
+<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
+<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
+<topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html">
+<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
+</topic>
+<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
+<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+</topic>
+</topic>
+</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
index 0058d81..0f6251b 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_publish.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="publishing" topic="topics/tpublish.html">
- <topic label="Publishing applications to a server" href="topics/tpublish.html">
- <topic label="Publishing your application" href="topics/twpub.html"/>
- </topic>
-</toc>
\ No newline at end of file
+<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
index 874e794..2962e57 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_test.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Testing J2EE projects" topic="topics/tj2ee.html">
- <topic label="Testing applications on a server" href="topics/tj2ee.html">
- <topic label="Testing artifacts on a server" href="topics/testing.html"/>
- </topic>
-</toc>
\ No newline at end of file
+<topic label="Testing applications on a server" href="topics/tj2ee.html">
+<topic label="Testing artifacts on a server" href="topics/testing.html"/>
+</topic>
+</toc>
