[312130] Doc update for "Automatically publish after a build event"
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
index c844a26..ebc3bf9 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/DocBuild.xml
@@ -51,7 +51,7 @@
<property name="args.copycss" value="no" />
<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
<property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.3.0" />
+ <property name="args.eclipse.version" value="3.6.0" />
<property name="args.input" location="org.eclipse.jst.server.ui.doc.user_build_toc.ditamap" />
<property name="clean.temp" value="true" />
<property name="dita.extname" value=".dita" />
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
index b769724..24f3f29 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
index fc9015e..a83cd8d 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/myplugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.6"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap
index bfa8a2b..b63cb78 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap
+++ b/docs/org.eclipse.jst.server.ui.doc.user/org.eclipse.jst.server.ui.doc.user_build_toc.ditamap
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="For building purposes">
-<topicref href="topics/tomcat.dita" navtitle="Creating a Tomcat server"></topicref>
-<topicref href="topics/twtomprf.dita" navtitle="Adding the Apache Tomcat runtimes">
+ "map.dtd">
+<map title="For building purposes" xml:lang="en-us">
+<topicref href="topics/tomcat.dita" navtitle="Creating a Tomcat server">
</topicref>
-</map><?Pub Caret1?>
-<?Pub *0000000406?>
+<topicref href="topics/twtomprf.dita"
+navtitle="Adding the Apache Tomcat runtimes"></topicref>
+</map>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
index fc9015e..a83cd8d 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.6"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap
index 6cd7d56..a7132a1 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map anchorref="../org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap#tomcat_create"
-title="tomcat_tasks">
-<topicref href="topics/tomcat.dita" locktitle="yes" navtitle="...Apache Tomcat"><?Pub Caret?>
-<topicref href="topics/twtomprf.dita" navtitle="Adding the Apache Tomcat runtimes"
-toc="no"></topicref>
+ "map.dtd">
+<map
+anchorref="../org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap#tomcat_create"
+title="tomcat_tasks" xml:lang="en-us">
+<topicref href="topics/tomcat.dita" locktitle="yes"
+navtitle="...Apache Tomcat">
+<topicref href="topics/twtomprf.dita"
+navtitle="Adding the Apache Tomcat runtimes" toc="no"></topicref>
</topicref>
</map>
-<?Pub *0000000496?>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap
index 9ecabf9..cb6115b 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap
+++ b/docs/org.eclipse.jst.server.ui.doc.user/tomcat_pref.ditamap
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map anchorref="../org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap#tomcat_pref"
-title="tomcat_tasks">
-<topicref href="topics/twtomprf.dita" locktitle="yes" navtitle="...for Apache Tomcat runtimes"><?Pub Caret?>
-</topicref>
+ "map.dtd">
+<map
+anchorref="../org.eclipse.wst.server.ui.doc.user/wtp_create.ditamap#tomcat_pref"
+title="tomcat_tasks" xml:lang="en-us">
+<topicref href="topics/twtomprf.dita" locktitle="yes"
+navtitle="...for Apache Tomcat runtimes"></topicref>
</map>
-<?Pub *0000000405?>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
index 9a3d182..abcdc1f 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/tomcat.html
@@ -2,8 +2,8 @@
<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, 2008 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, 2008" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 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, 2009" />
<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))' />
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.dita b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.dita
index 6da6abc..da7c08d 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.dita
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.dita
@@ -1,21 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2009, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Sty _display FontColor="red"?>
<task id="twtomprf_jst" xml:lang="en-us">
<title id="title">Adding the Apache Tomcat runtimes</title>
-<shortdesc id="shortdesc">Using the Preferences page, you can define the server
-runtime environment definitions for the Apache Tomcat server. To define these
-definitions, complete the following: </shortdesc>
+<shortdesc id="shortdesc">Using the Preferences page, you can define
+the server runtime environment definitions for the Apache Tomcat server.
+To define these definitions, complete the following: </shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm keyref="twtomprf|1|serversruntimeenvironmentsApacheTomcat"
-status="changed">servers<indexterm>Apache Tomcat</indexterm></indexterm><indexterm
-keyref="twtomprf|2|ApacheTomcatdefiningruntimeenvironment" status="new">Apache
-Tomcat<indexterm>defining runtime environment</indexterm></indexterm><indexterm
-keyref="twtomprf|3|runtimeenvironmentdefiningApacheTomcat" status="changed">runtime
-environments<indexterm>Apache Tomcat</indexterm></indexterm><indexterm keyref="twtomprf|4|workbenchdefiningserverruntimeenvironmentApacheTomcat"
-status="changed">workbench<indexterm>Apache Tomcat server runtime environment</indexterm></indexterm>
-</keywords>
+<keywords id="index"><indexterm
+keyref="twtomprf|1|serversruntimeenvironmentsApacheTomcat"
+status="changed">servers<indexterm>Apache Tomcat</indexterm></indexterm>
+<indexterm keyref="twtomprf|2|ApacheTomcatdefiningruntimeenvironment"
+status="new">Apache Tomcat<indexterm>defining runtime environment</indexterm></indexterm>
+<indexterm keyref="twtomprf|3|runtimeenvironmentdefiningApacheTomcat"
+status="changed">runtime environments<indexterm>Apache Tomcat</indexterm></indexterm>
+<indexterm
+keyref="twtomprf|4|workbenchdefiningserverruntimeenvironmentApacheTomcat"
+status="changed">workbench<indexterm>Apache Tomcat server runtime
+environment</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<steps id="steps">
@@ -35,28 +39,30 @@
<choice>Apache Tomcat v5.0</choice>
<choice>Apache Tomcat v5.5</choice>
<choice>Apache Tomcat v6.0</choice>
-</choices>
+<choice>Apache Tomcat v7.0</choice>
+</choices><?Pub Caret -1?>
</step>
-<step><cmd>When you add a server runtime environment, by default a server
-is created and added as an entry in the Servers view. If you want to only
-add the server runtime environment and not create the server in the Servers
-view, clear the <uicontrol>Create a new local server</uicontrol> check box.</cmd>
-</step>
+<step><cmd>When you add a server runtime environment, by default a
+server is created and added as an entry in the Servers view. If you
+want to only add the server runtime environment and not create the
+server in the Servers view, clear the <uicontrol>Create a new local
+server</uicontrol> check box.</cmd></step>
<step><cmd>The Tomcat Server page opens when you click <uicontrol>Next</uicontrol>.</cmd>
</step>
<step><cmd>In the <uicontrol>Tomcat installation directory</uicontrol> field,
-type or browse to the directory where you extracted the installation files
-of Apache Tomcat.</cmd><info> For example, <varname>x</varname>:\apache-tomcat-6.0.13,
-where <varname>x</varname> is the installation directory of the Apache Tomcat
-server.</info></step>
+type or browse to the directory where you extracted the installation
+files of Apache Tomcat.</cmd><info> For example, <varname>x</varname>:\apache-tomcat-6.0.13,
+where <varname>x</varname> is the installation directory of the Apache
+Tomcat server.</info></step>
<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
</steps>
</taskbody>
<related-links id="relatedlinks">
-<link href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" scope="external"><linktext>WTP
-Tomcat FAQ</linktext>
-<desc>See this link for additional information using the Apache Tomcat server
-with the workbench.</desc>
+<link href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" scope="external">
+<linktext>WTP Tomcat FAQ</linktext>
+<desc>See this link for additional information using the Apache Tomcat
+server with the workbench.</desc>
</link>
</related-links>
</task>
+<?Pub *0000003258?>
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
index b348036..199c158 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
+++ b/docs/org.eclipse.jst.server.ui.doc.user/topics/twtomprf.html
@@ -2,8 +2,8 @@
<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, 2008 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, 2008" />
+<meta name="copyright" content="Copyright (c) 2000, 2009 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, 2009" />
<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))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Adding the Apache Tomcat runtimes" />
<meta name="abstract" content="Using the Preferences page, you can define the server runtime environment definitions for the Apache Tomcat server. To define these definitions, complete the following:" />
<meta name="description" content="Using the Preferences page, you can define the server runtime environment definitions for the Apache Tomcat server. To define these definitions, complete the following:" />
-<meta content="servers, Apache Tomcat, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="DC.subject" />
-<meta content="servers, Apache Tomcat, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="keywords" />
+<meta content="servers, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="DC.subject" />
+<meta content="servers, Apache Tomcat, defining runtime environment, runtime environments, workbench, Apache Tomcat server runtime environment" name="keywords" />
<meta scheme="URI" name="DC.Relation" content="http://wiki.eclipse.org/WTP_Tomcat_FAQ" />
<meta content="XHTML" name="DC.Format" />
<meta content="twtomprf_jst" name="DC.Identifier" />
@@ -27,9 +27,9 @@
-<div><p>Using the Preferences page, you can define the server
-runtime environment definitions for the Apache Tomcat server. To define these
-definitions, complete the following: </p>
+<div><p>Using the Preferences page, you can define
+the server runtime environment definitions for the Apache Tomcat server.
+To define these definitions, complete the following: </p>
<a name="twtomprf_jst__steps"><!-- --></a><ol id="twtomprf_jst__steps">
<li class="stepexpand"><span>From the Window menu, select <span class="uicontrol">Preferences</span>.</span>
@@ -58,24 +58,26 @@
<li>Apache Tomcat v6.0</li>
+<li>Apache Tomcat v7.0</li>
+
</ul>
</li>
-<li class="stepexpand"><span>When you add a server runtime environment, by default a server
-is created and added as an entry in the Servers view. If you want to only
-add the server runtime environment and not create the server in the Servers
-view, clear the <span class="uicontrol">Create a new local server</span> check box.</span>
-</li>
+<li class="stepexpand"><span>When you add a server runtime environment, by default a
+server is created and added as an entry in the Servers view. If you
+want to only add the server runtime environment and not create the
+server in the Servers view, clear the <span class="uicontrol">Create a new local
+server</span> check box.</span></li>
<li class="stepexpand"><span>The Tomcat Server page opens when you click <span class="uicontrol">Next</span>.</span>
</li>
<li class="stepexpand"><span>In the <span class="uicontrol">Tomcat installation directory</span> field,
-type or browse to the directory where you extracted the installation files
-of Apache Tomcat.</span> For example, <var class="varname">x</var>:\apache-tomcat-6.0.13,
-where <var class="varname">x</var> is the installation directory of the Apache Tomcat
-server.</li>
+type or browse to the directory where you extracted the installation
+files of Apache Tomcat.</span> For example, <var class="varname">x</var>:\apache-tomcat-6.0.13,
+where <var class="varname">x</var> is the installation directory of the Apache
+Tomcat server.</li>
<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
@@ -84,8 +86,7 @@
</div>
<div><div class="relinfo"><strong>Related information</strong><br />
-<div><a href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" target="_blank" title="See this link for additional information using the Apache Tomcat server with the workbench.">WTP
-Tomcat FAQ</a></div>
+<div><a href="http://wiki.eclipse.org/WTP_Tomcat_FAQ" target="_blank" title="See this link for additional information using the Apache Tomcat server with the workbench.">WTP Tomcat FAQ</a></div>
</div>
</div>
