[231596] Docs. Index updates. Pre-built search index.
diff --git a/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml b/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
index aeada9a..235ccf2 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
@@ -23,6 +23,9 @@
 	- Created.
 	2008-01-09 Kate Price <katep@ca.ibm.com>
 	- modified for new DITA-OT version
+	2008-05-05 Kate Price <katep@ca.ibm.com>
+	- modified to add generation of pre-built help index. 
+	- Must delete /index folder before running build
 -->
 <project name="eclipsehelp" default="all">
 
@@ -57,4 +60,7 @@
 		</ant>
 		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
 	</target>
+	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
+	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
+	</target>
 </project>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs b/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs
new file mode 100644
index 0000000..740c4c5
--- /dev/null
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs b/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs
deleted file mode 100644
index 3a8c50a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/_u.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/deletable b/docs/org.eclipse.wst.webtools.doc.user/index/deletable
index e423242..593f470 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/index/deletable
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/deletable
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
index c2b7f40..f11e1b7 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
@@ -1,3 +1,3 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

-org.eclipse.wst.webtools.doc.user=org.eclipse.wst.webtools.doc.user\n1.0.300.qualifier

+#Wed May 14 20:03:02 EDT 2008

+org.eclipse.wst.webtools.doc.user=org.eclipse.wst.webtools.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
index 9e7fe0e..430c2cb 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
@@ -1,4 +1,4 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

-lucene=1.4.103.v20060601

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

+#Wed May 14 20:03:02 EDT 2008

+lucene=1.9.1.v200803061811

+analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
index f39e5f0..be0097c 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
@@ -1,19 +1,24 @@
 #This is a generated file; do not edit.

-#Wed May 09 14:15:21 EDT 2007

+#Wed May 14 20:03:02 EDT 2008

+/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.html=0

 /org.eclipse.wst.webtools.doc.user/topics/ccwtover.html=0

 /org.eclipse.wst.webtools.doc.user/topics/tjdetags.html=0

 /org.eclipse.wst.webtools.doc.user/topics/cwebresources.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html=0

 /org.eclipse.wst.webtools.doc.user/topics/tservertarget.html=0

+/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html=0

 /org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html=0

 /org.eclipse.wst.webtools.doc.user/topics/cwservbn.html=0

+/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html=0

 /org.eclipse.wst.webtools.doc.user/topics/twprjset.html=0

+/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html=0

 /org.eclipse.wst.webtools.doc.user/topics/tjprefs.html=0

 /org.eclipse.wst.webtools.doc.user/topics/twcvsr.html=0

 /org.eclipse.wst.webtools.doc.user/topics/twcreprj.html=0

 /org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html=0

+/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.html=0

 /org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html=0

 /org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html=0

+/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.html=0

 /org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html=0

 /org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html=0

 /org.eclipse.wst.webtools.doc.user/topics/twcresta.html=0

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/segments b/docs/org.eclipse.wst.webtools.doc.user/index/segments
index 19b5d0c..4d97698 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/index/segments
+++ b/docs/org.eclipse.wst.webtools.doc.user/index/segments
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap b/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
index c666218..4778f32 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
+++ b/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

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

  "map.dtd">

-<map title="Web tools related links"><?Pub Caret1?>

+<map title="Web tools related links">

 <reltable>

 <relheader>

 <relcolspec type="concept"></relcolspec>

@@ -270,7 +270,7 @@
 </topicref>

 <topicref href="topics/cwservbn.dita" linking="targetonly" navtitle="Servlets">

 </topicref>

-<topicref href="topics/cwlistvbn.dita" linking="targetonly" navtitle="Listeners">

+<topicref href="topics/cwlistbn.dita" linking="targetonly" navtitle="Listeners">

 </topicref>

 <topicref href="topics/cwfiltbn.dita" linking="targetonly" navtitle="Filters">

 </topicref>

@@ -480,4 +480,3 @@
 </relrow>

 </reltable>

 </map>

-<?Pub *0000014944?>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
index cc86113..4c043e0 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
@@ -5,9 +5,9 @@
 <concept id="ccwebvw" xml:lang="en-us">

 <title>Project Explorer view and Web development</title>

 <prolog><metadata>

-<keywords><indexterm>Project Explorer view<indexterm>overview</indexterm></indexterm>

-<indexterm>Web development<indexterm>Project Explorer view</indexterm></indexterm>

-<indexterm>Web perspective<indexterm>Project Explorer view</indexterm></indexterm>

+<keywords><indexterm keyref="ccwebvw|1|ProjectExplorerviewoverview" status="new">Project

+Explorer view<indexterm>overview</indexterm></indexterm><indexterm keyref="ccwebvw|2|WebdevelopmentProjectExplorerview"

+status="changed">Web projects<indexterm>Project Explorer view</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <conbody>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
index 5f2e61d..abf57ac 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
@@ -9,8 +9,8 @@
 <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="Project Explorer view and Web development" />
-<meta content="Project Explorer view, overview, Web development, Web perspective" name="DC.subject" />
-<meta content="Project Explorer view, overview, Web development, Web perspective" name="keywords" />
+<meta content="Project Explorer view, overview, Web projects, Project Explorer view" name="DC.subject" />
+<meta content="Project Explorer view, overview, Web projects, Project Explorer view" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="ccwebvw" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
index 07a94f1..d7224f0 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

 <concept id="cpdjsps" xml:lang="en-us">

 <title>JavaServer Pages (JSP) technology</title>

 <prolog><metadata>

-<keywords><indexterm>JSP pages<indexterm>overview</indexterm></indexterm>

-<indexterm>Web content<indexterm>generating dynamically</indexterm></indexterm>

+<keywords><indexterm keyref="cpdjsps|1|JSPpagesoverview" status="changed">JSP

+files<indexterm>overview</indexterm></indexterm><indexterm keyref="cpdjsps|2|Webcontentgeneratingdynamically"

+status="new">Web content<indexterm>generating dynamically</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <conbody>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
index 92336ae..50dc629 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
@@ -9,10 +9,10 @@
 <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="JavaServer Pages (JSP) technology" />
-<meta content="JSP pages, overview, Web content, generating dynamically" name="DC.subject" />
-<meta content="JSP pages, overview, Web content, generating dynamically" name="keywords" />
+<meta content="JSP files, overview, Web content, generating dynamically" name="DC.subject" />
+<meta content="JSP files, overview, Web content, generating dynamically" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cwservbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwlistvbn.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tjcrejsp.html" />
 <meta content="XHTML" name="DC.Format" />
@@ -64,7 +64,7 @@
 
 <div><div class="relconcepts"><strong>Related concepts</strong><br />
 <div><a href="../topics/cwservbn.html" title="">Servlets</a></div>
-<div><a href="../topics/cwlistvbn.html" title="">Listeners</a></div>
+<div><a href="../topics/cwlistbn.html" title="">Listeners</a></div>
 <div><a href="../topics/cwfiltbn.html" title="">Listeners</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
index 79482d0..41b5813 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

 <concept id="cwservbn" xml:lang="en-us">

 <title>Servlets</title>

 <prolog><metadata>

-<keywords><indexterm>servlets<indexterm>overview</indexterm></indexterm>

-<indexterm>Web servers<indexterm>generating dynamic content</indexterm></indexterm>

-</keywords>

+<keywords><indexterm>servlets<indexterm>overview</indexterm></indexterm><indexterm>Web

+servers<indexterm>generating dynamic content</indexterm></indexterm></keywords>

 </metadata></prolog>

 <conbody>

 <p>Servlets are server-side <tm tmclass="special" tmowner="Sun Microsystems, Inc."

@@ -34,10 +33,10 @@
 </ul>Using this paradigm, you may choose to have business logic handled by <tm

 tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans,

 the presentation logic handled by JavaServer Pages (JSP) or HTML files, and

-the HTTP protocol handled by a servlet. <note>JSP files can be used to manage

-both the presentation and business logic for a Web application. JSP files

-use structured markup for presentation, and supply servlet model behavior

-at run time.</p>

+the HTTP protocol handled by a servlet.</p>

+<note>JSP files can be used to manage both the presentation and business logic

+for a Web application. JSP files use structured markup for presentation, and

+supply servlet model behavior at run time.</note>

 <p>You can develop, debug, and deploy servlets, set breakpoints within servlet

 objects, and step through code to make changes that are dynamically folded

 into the running servlet on a running server, without having to restart each

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
index 7382f91..a471e78 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
@@ -11,8 +11,12 @@
 <meta name="DC.Title" content="Servlets" />
 <meta content="servlets, overview, Web servers, generating dynamic content" name="DC.subject" />
 <meta content="servlets, overview, Web servers, generating dynamic content" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/ccwtover.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/twsrvwiz.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twlstwiz.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/twfltwiz.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cwservbn" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -50,11 +54,11 @@
 </ul>
 Using this paradigm, you may choose to have business logic handled by Java beans,
 the presentation logic handled by JavaServer Pages (JSP) or HTML files, and
-the HTTP protocol handled by a servlet. <div class="note"><span class="notetitle">Note:</span> JSP files can be used to manage
-both the presentation and business logic for a Web application. JSP files
-use structured markup for presentation, and supply servlet model behavior
-at run time.</div>
-</div>
+the HTTP protocol handled by a servlet.</div>
+
+<div class="note"><span class="notetitle">Note:</span> JSP files can be used to manage both the presentation and business logic
+for a Web application. JSP files use structured markup for presentation, and
+supply servlet model behavior at run time.</div>
 
 <p>You can develop, debug, and deploy servlets, set breakpoints within servlet
 objects, and step through code to make changes that are dynamically folded
@@ -67,10 +71,14 @@
 </div>
 
 <div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwlistbn.html" title="">Listeners</a></div>
+<div><a href="../topics/cwfiltbn.html" title="">Listeners</a></div>
 <div><a href="../topics/ccwtover.html" title="">Web application overview</a></div>
 </div>
 <div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twsrvwiz.html">Creating servlets</a></div>
+<div><a href="../topics/twsrvwiz.html">Creating Servlets</a></div>
+<div><a href="../topics/twlstwiz.html">Creating Listeners</a></div>
+<div><a href="../topics/twfltwiz.html">Creating Filters</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
index 7c8ea61..d3733dd 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

 <concept id="cwwedtvw" xml:lang="en-us">

 <title>Workbench integration with Web editors</title>

 <prolog><metadata>

-<keywords><indexterm>Web editors<indexterm>workbench integration</indexterm></indexterm>

-</keywords>

+<keywords><indexterm keyref="cwwedtvw|1|Webeditorsworkbenchintegration" status="changed">workbench<indexterm>Web

+editors</indexterm></indexterm></keywords>

 </metadata></prolog>

 <conbody>

 <p>There are several editors for use in various contexts for various file

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
index c94e2bb..a911f51 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
@@ -9,8 +9,8 @@
 <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="Workbench integration with Web editors" />
-<meta content="Web editors, workbench integration" name="DC.subject" />
-<meta content="Web editors, workbench integration" name="keywords" />
+<meta content="workbench, Web editors" name="DC.subject" />
+<meta content="workbench, Web editors" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cwwedtvw" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
index 94e4948..02c73d4 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

+<!--Arbortext, Inc., 1988-2006, v.4002-->

 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "task.dtd">

-<!-- ArborText, Inc.,  1988-2002, v.4002-->

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

 <title>Defining HTML file preferences</title>

 <prolog><metadata>

-<keywords>

-</keywords>

+<keywords><indexterm keyref="tjprefs|1|DOCTYPEdeclarationsaddingautomatically"

+status="new">DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm>

+<indexterm keyref="tjprefs|2|HTMLfileseditingpreferences" status="changed">HTML<indexterm>editing

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

 </metadata></prolog>

 <taskbody>

-<context> <p><indexterm>DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm>

-<indexterm>HTML files<indexterm>editing preferences</indexterm></indexterm>

-To define general HTML file preferences, complete the following

-steps::</p></context>

+<context> <p><indexterm>DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm> <indexterm>HTML

+files<indexterm>editing preferences</indexterm></indexterm> To define general

+HTML file preferences, complete the following steps:</p></context>

 <steps>

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

 </step>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
index 542284a..772f123 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
@@ -9,6 +9,8 @@
 <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 HTML file preferences" />
+<meta content="DOCTYPE declarations, adding automatically, HTML, editing preferences" name="DC.subject" />
+<meta content="DOCTYPE declarations, adding automatically, HTML, editing preferences" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjprefs" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -22,10 +24,8 @@
 
 
 <div>
-<div class="section"> <p>
-
-To define general HTML file preferences, complete the following
-steps::</p>
+<div class="section"> <p>  To define general
+HTML file preferences, complete the following steps:</p>
 </div>
 
 <ol>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita
index 8953022..23c92fe 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita
@@ -5,74 +5,69 @@
 <task id="twfltwiz" xml:lang="en-us">

 <title>Creating Filters</title>

 <shortdesc>The filters wizard helps you to create <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> servlet filters

-by walking you through the creation process and and by providing you with output files

-that you can use or that you can modify for use with your Web

-application. The filters can run on Java EE-compliant Web servers.</shortdesc>

+tmtype="tm" trademark="Java">Java</tm> servlet filters by walking you through

+the creation process and by providing you with output files that you can use

+or that you can modify for use with your Web application. The filters can

+run on Java EE-compliant Web servers.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context> <p>To create a filter, complete the following steps: </p></context>

-<<steps>

+<steps>

 <step><cmd>In the Java EE perspective, expand your  <xref href="ccwebprj.dita"

-scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd></step>

+scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd>

+</step>

 <step><cmd>Right click on the <b>Filter</b> icon, and select <menucascade>

 <uicontrol>New</uicontrol><uicontrol>Filter</uicontrol></menucascade> from

-the pop-up menu.</cmd><stepresult> The <uicontrol>Create FIlter</uicontrol> wizard

+the pop-up menu.</cmd><stepresult> The <uicontrol>Create Filter</uicontrol> wizard

 appears.</stepresult></step>

 <step><cmd>Follow the project wizard prompts.</cmd></step>

 </steps>

 <postreq><p><b>General Information</b></p><dl><dlentry>

-<p><dt>Modifiers</dt></p>

-<dd>The <cite>Sun

-Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states that a

-	Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore,

-	you cannot change these modifiers. The only one available for change is

-	the <b>final</b> modifier.</dd>

+<dt>Modifiers</dt>

+<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states

+that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore,

+you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.</dd>

 </dlentry><dlentry>

-<p><dt>Interfaces</dt></p>

-<dd>There is one obligatory interface that filter classes must

-	implement: <b>javax.servlet.Filter</b>. This interface is

-	provided by javax.servlet package and is used to represent the

-	life-cycle of the filter. This interface has three methods: init,

-	doFilter and destroy. <ul>

-	<li>The <b>init</b> method is called by the servlet

-	container only once, when it finishes instantiating the filter.</li>	

-	<li>The	<b>doFilter</b> method is where the filtering is performed and is called every

-	time a user requests a resource, such as a servlet, to which the filter

-	is mapped.</li> 

-	<li>The <b>destroy</b> method is called by the servlet container to

-	tell the filter that it will be taken out of service.</li>

-	</ul> Although, that the javax.servlet.Filter interface is provided in the <b>Interfaces</b>

-	field by default, you can add additional interfaces to implement by using the <b>Add</b> button.</dd>

+<dt>Interfaces</dt>

+<dd>There is one obligatory interface that filter classes must implement: <b>javax.servlet.Filter</b>.

+This interface is provided by javax.servlet package and is used to represent

+the life-cycle of the filter. This interface has three methods: init, doFilter

+and destroy. <ul>

+<li>The <b>init</b> method is called by the servlet container only once, when

+it finishes instantiating the filter.</li>

+<li>The<b>doFilter</b> method is where the filtering is performed and is called

+every time a user requests a resource, such as a servlet, to which the filter

+is mapped.</li>

+<li>The <b>destroy</b> method is called by the servlet container to tell the

+filter that it will be taken out of service.</li>

+</ul> Although, that the javax.servlet.Filter interface is provided in the <b>Interfaces</b> field

+by default, you can add additional interfaces to implement by using the <b>Add</b> button.</dd>

 </dlentry><dlentry>

-<p><dt>Interface selection dialog</dt></p>

-<dd>This dialog appears if you select to add an interface to your

-	filter. As you type the name of the interface that you are adding, a

-	list of available interfaces listed in the <b>Matching items</b> list box

-	updates dynamically to display only the interfaces that match the

-	pattern. Choose an interface to see the qualifier, and then

-	click <b>OK</b> when finished.</dd>

+<dt>Interface selection dialog</dt>

+<dd>This dialog appears if you select to add an interface to your filter.

+As you type the name of the interface that you are adding, a list of available

+interfaces listed in the <b>Matching items</b> list box updates dynamically

+to display only the interfaces that match the pattern. Choose an interface

+to see the qualifier, and then click <b>OK</b> when finished.</dd>

 </dlentry><dlentry>

-<p><dt>Filter Mappings</dt></p>	

-<dd>For a filter to intercept a request to a servlet, you must:

-	<ol>

-		<li>declare the filter with a <b>&lt;filter&gt;</b> element in

-		the deployment descriptor</li>

-		<li>map the filter to the servlet using the <b>&lt;filter-mapping&gt;</b>

-		element.</li>

-	</ol>

-	Sometimes you want a filter to work on multiple servlets. You can do

-	this by mapping a filter to a URL pattern so that any request that

-	matches that URL pattern will be filtered. All this is made

-	automatically if you use the <b>Filter Mappings</b> field.</dd>

+<dt>Filter Mappings</dt>

+<dd>For a filter to intercept a request to a servlet, you must: <ol>

+<li>declare the filter with a <b>&lt;filter&gt;</b> element in the deployment

+descriptor</li>

+<li>map the filter to the servlet using the <b>&lt;filter-mapping&gt;</b> 

+element.</li>

+</ol> Sometimes you want a filter to work on multiple servlets. You can do

+this by mapping a filter to a URL pattern so that any request that matches

+that URL pattern will be filtered. All this is made automatically if you use

+the <b>Filter Mappings</b> field.</dd>

 </dlentry><dlentry>

-<p><dt>Method stubs</dt></p>

-<dd>Because each filter must implement the javax.servlet.Filter

-	interface, the <b>Inherited abstract methods</b> option is always

-	checked and cannot be changed.</dd>

+<dt>Method stubs</dt>

+<dd>Because each filter must implement the javax.servlet.Filter interface,

+the <b>Inherited abstract methods</b> option is always checked and cannot

+be changed.</dd>

 </dlentry></dl></postreq>

 </taskbody>

 </task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html
index 416306c..fcb8aa0 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html
@@ -1,126 +1,123 @@
-<?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>
 <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 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 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 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 Filters" />
-<meta content="filters, creating" name="DC.subject" />
-<meta content="filters, creating" name="keywords" />
+<meta name="abstract" content="The filters wizard helps you to create Java servlet filters by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The filters can run on Java EE-compliant Web servers." />
+<meta name="description" content="The filters wizard helps you to create Java servlet filters by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The filters can run on Java EE-compliant Web servers." />
+<meta content="servlets, creating" name="DC.subject" />
+<meta content="servlets, creating" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twfltwiz" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css"
-	rel="stylesheet" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
 <title>Creating Filters</title>
 </head>
-<body id="twfltwiz">
-<a name="twfltwiz"><!-- --></a>
+<body id="twfltwiz"><a name="twfltwiz"><!-- --></a>
 
 
 <h1 class="topictitle1">Creating Filters</h1>
 
-<div>
 
-	<p>The filter wizard helps you create Java servlet filters by walking
-you through the creation process and by providing you with output files
-that you can use or that you can modify for use with your Web
-application. The filters can run on Java EE-compliant Web servers.</p>
-	
-	<div class="section">
-	<p>To create a filter, complete the following steps:</p>
-	</div>
 
-	<ol>
-		<li class="stepexpand"><span>In the Java EE perspective,
-		expand your <a href="ccwebprj.html" title="">dynamic project</a> in the
-		Project Explorer view.</span></li>
-	
-		<li class="stepexpand"><span>Right click on the <strong>Filter</strong>
-		icon, and select <span class="menucascade"> <span
-			class="uicontrol">New</span> &gt; <span class="uicontrol">Filter</span></span>
-		from the pop-up menu.</span> The <span class="uicontrol">Create Filter</span>
-		wizard appears.</li>
-	
-		<li class="stepexpand"><span>Follow the project wizard
-		prompts.</span></li>
-	
-	</ol>
+<div><p>The filters wizard helps you to create Java™ servlet filters by walking you through
+the creation process and by providing you with output files that you can use
+or that you can modify for use with your Web application. The filters can
+run on Java EE-compliant Web servers.</p>
 
-<div class="section">
-<p><strong>General Information</strong></p>
+<div class="section"> <p>To create a filter, complete the following steps: </p>
+</div>
+
+<ol>
+<li class="stepexpand"><span>In the Java EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span>
+</li>
+
+<li class="stepexpand"><span>Right click on the <strong>Filter</strong> icon, and select <span class="menucascade">
+<span class="uicontrol">New</span> &gt; <span class="uicontrol">Filter</span></span> from
+the pop-up menu.</span>  The <span class="uicontrol">Create Filter</span> wizard
+appears.</li>
+
+<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
+
+</ol>
+
+<div class="section"><p><strong>General Information</strong></p>
 <dl>
-	
-	<p><dt class="dlterm">Modifiers</dt></p>
+<dt class="dlterm">Modifiers</dt>
 
-	<dd>The <cite>Sun Microsystems Java Servlet Specification</cite> states that a
-	Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore,
-	you cannot change these modifiers. The only one available for change is
-	the <b>final</b> modifier. </dd>
+<dd>The <cite>Sun Microsystems Java Servlet 2.3 Specification</cite> states
+that a Servlet class must be <strong>public</strong> and not <strong>abstract</strong>. Therefore,
+you cannot change these modifiers. The only one available for change is the <strong>final</strong> modifier.</dd>
 
 
-	<p><dt class="dlterm">Interfaces</dt></p>
+<dt class="dlterm">Interfaces</dt>
 
-	<dd>There is one obligatory interface that filter classes must
-	implement: <strong>javax.servlet.Filter</strong>. This interface is
-	provided by javax.servlet package and is used to represent the
-	life-cycle of the filter. This interface has three methods: init,
-	doFilter and destroy.
-	<ul>
-		<li>The <strong>init</strong> method is called by the servlet
-		container only once, when it finishes instantiating the filter.</li>
-		<li>The <strong>doFilter</strong> method is where the filtering
-		is performed and is called every time a user requests a resource, such
-		as a servlet, to which the filter is mapped.</li>
-		<li>The <strong>destroy</strong> method is called by the servlet
-		container to tell the filter that it will be taken out of service.</li>
-	</ul>
-	You can add additional interfaces to implement by using the <strong>Add</strong>
-	button.</dd>
+<dd>There is one obligatory interface that filter classes must implement: <strong>javax.servlet.Filter</strong>.
+This interface is provided by javax.servlet package and is used to represent
+the life-cycle of the filter. This interface has three methods: init, doFilter
+and destroy. <ul>
+<li>The <strong>init</strong> method is called by the servlet container only once, when
+it finishes instantiating the filter.</li>
+
+<li>The<strong>doFilter</strong> method is where the filtering is performed and is called
+every time a user requests a resource, such as a servlet, to which the filter
+is mapped.</li>
+
+<li>The <strong>destroy</strong> method is called by the servlet container to tell the
+filter that it will be taken out of service.</li>
+
+</ul>
+ Although, that the javax.servlet.Filter interface is provided in the <strong>Interfaces</strong> field
+by default, you can add additional interfaces to implement by using the <strong>Add</strong> button.</dd>
 
 
-	<p>
-	<dt class="dlterm">Interfaces dialog</dt>
-	</p>
+<dt class="dlterm">Interface selection dialog</dt>
 
-	<dd>This dialog appears if you select to add an interface to your
-	filter. As you type the name of the interface that you are adding, a
-	list of available interfaces listed in the <b>Matching items</b> list box
-	updates dynamically to display only the interfaces that match the
-	pattern. Choose an interface to see the qualifier, and then
-	click <b>OK</b> when finished.</dd>
+<dd>This dialog appears if you select to add an interface to your filter.
+As you type the name of the interface that you are adding, a list of available
+interfaces listed in the <strong>Matching items</strong> list box updates dynamically
+to display only the interfaces that match the pattern. Choose an interface
+to see the qualifier, and then click <strong>OK</strong> when finished.</dd>
 
 
-	<p><dt class="dlterm">Filter Mappings</dt></p>
+<dt class="dlterm">Filter Mappings</dt>
 
-	<dd>For a filter to intercept a request to a servlet, you must:
-	<ol>
-		<li>declare the filter with a <b>&lt;filter&gt;</b> element in
-		the deployment descriptor</li>
-		<li>map the filter to the servlet using the <b>&lt;filter-mapping&gt;</b>
-		element.</li>
-	</ol>
-	Sometimes you want a filter to work on multiple servlets. You can do
-	this by mapping a filter to a URL pattern so that any request that
-	matches that URL pattern will be filtered. All this is made
-	automatically if you use the <b>Filter Mappings</b> field.</dd>
+<dd>For a filter to intercept a request to a servlet, you must: <ol>
+<li>declare the filter with a <strong>&lt;filter&gt;</strong> element in the deployment
+descriptor</li>
 
-	<p><dt class="dlterm">Method stubs</dt></p>
-	<dd>Because each filter must implement the javax.servlet.Filter
-	interface, the <b>Inherited abstract methods</b> option is always
-	checked and cannot be changed.</dd>
+<li>map the filter to the servlet using the <strong>&lt;filter-mapping&gt;</strong> 
+element.</li>
+
+</ol>
+ Sometimes you want a filter to work on multiple servlets. You can do
+this by mapping a filter to a URL pattern so that any request that matches
+that URL pattern will be filtered. All this is made automatically if you use
+the <strong>Filter Mappings</strong> field.</dd>
+
+
+<dt class="dlterm">Method stubs</dt>
+
+<dd>Because each filter must implement the javax.servlet.Filter interface,
+the <strong>Inherited abstract methods</strong> option is always checked and cannot
+be changed.</dd>
 
 </dl>
 </div>
 
 </div>
-</body>
-</html>
 
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwfiltbn.html">Filters</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita
index 495961c..f8b1edb 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita
@@ -1,110 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>

 <!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

+<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

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

 <title>Creating Listeners</title>

-<shortdesc>The listener wizard helps you create application lifecycle

-listeners by walking you through the creation process and by providing

-you with output files that you can use or that you can modify for use

-with your Web application. The listeners can run on Java EE-compliant

-Web servers.</shortdesc>

+<shortdesc>The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody>

 <context> <p>To create a listener, complete the following steps: </p></context>

 <steps>

-<step><cmd>From the Java EE perspective, expand your  <xref href="ccwebprj.dita"

-scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd></step>

-<step><cmd>Right click on the <b>Listener</b> icon, and select <menucascade>

-<uicontrol>New</uicontrol><uicontrol>Listener</uicontrol></menucascade> from

-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Listener</uicontrol> wizard

-appears.</stepresult></step>

+<step><cmd>From the Java EE perspective, expand your  <xref href="ccwebprj.dita" scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd></step>

+<step><cmd>Right click on the <b>Listener</b> icon, and select <menucascade><uicontrol>New</uicontrol><uicontrol>Listener</uicontrol></menucascade> from the pop-up menu.</cmd><stepresult> The <uicontrol>Create Listener</uicontrol> wizard appears.</stepresult></step>

 <step><cmd>Follow the project wizard prompts.</cmd></step>

 </steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<p><dt>Application lifecycle listeners</dt></p>

-<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite>defines the

-	following interfaces that represent that application lifecycle

-	listeners. You should select at least one of the intefaces.

-	<ul>

-		<li><b>javax.servlet.ServletContextListener:</b> This interface is provided by javax.servlet package and can be used

-		to listen to the ServletContext life-cycle events. This interface has

-		two methods: contextInitialized and contextDestroyed. The

-		<b><i>contextInitialized</i></b> method is called when the web application is ready

-		to service requests and the <b><i>contextDestroyed</i></b> method is invoked when

-		the servlet context is about to be shut down.</li>

-		<li><b>javax.servlet.ServletContextAttributeListener:</b> This interface is provided by javax.servlet package. It can be used

-		to be notified when any attribute is added to the ServletContext or if

-		any of the ServletContext's attributes are changed or removed. This

-		inetface has three methods: <b><i>attributeAdded, attributeRemoved</i></b> and

-		<b><i>attributeReplaced</i></b>.</li>

-		<li><b>javax.servlet.ServletRequestListener:</b> This interface is provided by javax.servlet package. It can be used

-		to be notified when a request is coming in or out of scope in a Web

-		component. This interface has two methods: requestInitialized and

-		requestDestroyed. The <b><i>requestInitialized</i></b> method is called when it is

-		about to enter the first servlet or filter in each Web application. The <b><i>requestDestroyed</i></b> method is called when it exits the last servlet

-		or the first filter in the chain.</li>

-		<li><b>javax.servlet.ServletRequestAttributeListener:</b> This interface is provided by javax.servlet package and can be used

-		to be notified when any request attribute is changed. This interface

-		has three methods: attributeAdded, attributeRemoved and

-		attributeReplaced. The <b><i>attributteAdded</i></b> method is called when a new

-		attribute was added to servlet request. The <b><i>attributeRemoved</i></b> method is

-		called when an existing attribute has been removed from the servlet

-		request. The <b><i>attributeReplaced</i></b> method is called when an attribute

-		was replaced on the servlet request.</li>

-		<li><b>javax.servlet.http.HttpSessionListener:</b> This interface is provided by javax.servlet.http package and can be

-		used to listen to a session’s life cycle events. This interface has

-		two methods: sessionCreated and sessionDestroyed. The <b><i>sessionCreated</i></b>

-		method is called when an HttpSession object is created. The

-		<b><i>sessionDestroyed</i></b> method is called when an HttpSession object is

-		invalidated.</li>

-		<li><b>javax.servlet.http.HttpSessionActivationListener:</b> This interface is provided by javax.servlet.http package. It can be

-		used to listen to a container events notifying that sessions will be

-		passivated or activated. This interface has two methods:

-		sessionDidActivate and sessionWillPasivate. The <b><i>sessionDidActivate</i></b> is

-		called when the session has just been activated and the

-		<b><i>sessionWillPasivate</i></b> is called when the session is about to be

-		passivated.</li>

-		<li><b>javax.servlet.http.HttpSessionAttributeListener:</b> This interface is provided by javax.servlet.http package and can be

-		used to listen to events related to session attributes. This interface

-		has three methods: attributeAdded, attributeRemoved and

-		attributeReplaced. The <b><i>attributeAdded</i></b> method is called when an

-		attribute is added to an HttpSession object. The <b><i>attributeRemoved</i></b> and

-		<b><i>attributeReplaced</i></b> methods are called when an HttpSession attribute is

-		removed or replaced, respectively.</li>

-		<li><b>javax.servlet.http.HttpSessionBindingListener:</b> This interface is provided by javax.servlet.http package and can be

-		used to be notified when an object is bound to or unbound from a

-		session. This interface has two methods: valueBound and valueUnbound.

-		The <b><i>valueBound</i></b> method is called when the object is being bound to a

-		session and identifies the session. The <b><i>valueUnbound</i></b> method is called

-		when the object is being unbound from a session and identifies the

-		session.</li>

-	</ul>

-	</dd>

+<postreq><dl><dlentry>

+<dt>Application lifecycle listeners</dt>

+<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite>defines the 	following interfaces that represent that application lifecycle 	listeners. You should select at least one of the intefaces. 	<ul>

+<li><b>javax.servlet.ServletContextListener:</b> This interface is provided by javax.servlet package and can be used to listen to the ServletContext life-cycle events. This interface has two methods: contextInitialized and contextDestroyed. The <b><i>contextInitialized</i></b> method is called when the web application is ready to service requests and the <b><i>contextDestroyed</i></b> method is invoked when the servlet context is about to be shut down.</li>

+<li><b>javax.servlet.ServletContextAttributeListener:</b> This interface is provided by javax.servlet package. It can be used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. This inetface has three methods: <b><i>attributeAdded, attributeRemoved</i></b> and <b><i>attributeReplaced</i></b>.</li>

+<li><b>javax.servlet.ServletRequestListener:</b> This interface is provided by javax.servlet package. It can be used to be notified when a request is coming in or out of scope in a Web component. This interface has two methods: requestInitialized and requestDestroyed. The <b><i>requestInitialized</i></b> method is called when it is about to enter the first servlet or filter in each Web application. The <b><i>requestDestroyed</i></b> method is called when it exits the last servlet or the first filter in the chain.</li>

+<li><b>javax.servlet.ServletRequestAttributeListener:</b> This interface is provided by javax.servlet package and can be used to be notified when any request attribute is changed. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <b><i>attributteAdded</i></b> method is called when a new attribute was added to servlet request. The <b><i>attributeRemoved</i></b> method is called when an existing attribute has been removed from the servlet request. The <b><i>attributeReplaced</i></b> method is called when an attribute was replaced on the servlet request.</li>

+<li><b>javax.servlet.http.HttpSessionListener:</b> This interface is provided by javax.servlet.http package and can be used to listen to a sessions life cycle events. This interface has two methods: sessionCreated and sessionDestroyed. The <b><i>sessionCreated</i></b>  	method is called when an HttpSession object is created. The <b><i>sessionDestroyed</i></b> method is called when an HttpSession object is invalidated.</li>

+<li><b>javax.servlet.http.HttpSessionActivationListener:</b> This interface is provided by javax.servlet.http package. It can be used to listen to a container events notifying that sessions will be passivated or activated. This interface has two methods: sessionDidActivate and sessionWillPasivate. The <b><i>sessionDidActivate</i></b> is called when the session has just been activated and the <b><i>sessionWillPasivate</i></b> is called when the session is about to be passivated.</li>

+<li><b>javax.servlet.http.HttpSessionAttributeListener:</b> This interface is provided by javax.servlet.http package and can be used to listen to events related to session attributes. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <b><i>attributeAdded</i></b> method is called when an attribute is added to an HttpSession object. The <b><i>attributeRemoved</i></b> and <b><i>attributeReplaced</i></b> methods are called when an HttpSession attribute is removed or replaced, respectively.</li>

+<li><b>javax.servlet.http.HttpSessionBindingListener:</b> This interface is provided by javax.servlet.http package and can be used to be notified when an object is bound to or unbound from a session. This interface has two methods: valueBound and valueUnbound. The <b><i>valueBound</i></b> method is called when the object is being bound to a session and identifies the session. The <b><i>valueUnbound</i></b> method is called when the object is being unbound from a session and identifies the session.</li>

+</ul> 	</dd>

 </dlentry><dlentry>

-<p><dt>Modifiers</dt></p>

-<dd>The <cite>Sun

-Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states that a

-	Listener class must be <b>public</b> and not <b>abstract</b>. Therefore,

-	you cannot change these modifiers. The only one available for change is

-	the <b>final</b> modifier.</dd>

+<dt>Modifiers</dt>

+<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states that a 	Listener class must be <b>public</b> and not <b>abstract</b>. Therefore, 	you cannot change these modifiers. The only one available for change is 	the <b>final</b> modifier.</dd>

 </dlentry><dlentry>

-<p><dt>Interfaces</dt></p>

-<dd>The interfaces that you selected in the previous page of the wizard

-	are provided as default values in the <b>Interfaces</b> field. To add

-	additional interfaces, click the <b>Add</b> button next to this field.</dd>

+<dt>Interfaces</dt>

+<dd>The interfaces that you selected in the previous page of the wizard 	are provided as default values in the <b>Interfaces</b> field. To add 	additional interfaces, click the <b>Add</b> button next to this field.</dd>

 </dlentry><dlentry>

-<p><dt>Interface selection dialog</dt></p>

-<dd>This dialog appears if you select to add an interface to your

-	servlet. As you type the name of the interface that you are adding, a

-	list of available interfaces listed in the <b>Matching items</b> list box

-	updates dynamically to display only the interfaces that match the

-	pattern. Choose an interface to see the qualifier, and then click <b>OK</b>

-	when finished.</dd>

+<dt>Interface selection dialog</dt>

+<dd>This dialog appears if you select to add an interface to your 	servlet. As you type the name of the interface that you are adding, a 	list of available interfaces listed in the <b>Matching items</b> list box 	updates dynamically to display only the interfaces that match the 	pattern. Choose an interface to see the qualifier, and then click <b>OK</b> 	when finished.</dd>

 </dlentry></dl></postreq>

 </taskbody>

 </task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html
index aa432f3..1462cc6 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html
@@ -1,165 +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>
 <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 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 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 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 Listeners" />
-<meta content="listeners, creating" name="DC.subject" />
-<meta content="listeners, creating" name="keywords" />
+<meta name="abstract" content="The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers." />
+<meta name="description" content="The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers." />
+<meta content="servlets, creating" name="DC.subject" />
+<meta content="servlets, creating" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twlstwiz" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css"
-	rel="stylesheet" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
 <title>Creating Listeners</title>
 </head>
-<body id="twlstwiz">
-<a name="twlstwiz"><!-- --></a>
+<body id="twlstwiz"><a name="twlstwiz"><!-- --></a>
 
 
 <h1 class="topictitle1">Creating Listeners</h1>
 
-<div>
-<p>The listener wizard helps you create application lifecycle
-listeners by walking you through the creation process and by providing
-you with output files that you can use or that you can modify for use
-with your Web application. The listeners can run on Java EE-compliant
-Web servers.</p>
 
-<div class="section">
-<p>To create a listener, complete the following steps:</p>
+
+<div><p>The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers.</p>
+
+<div class="section"> <p>To create a listener, complete the following steps: </p>
 </div>
 
 <ol>
-	<li class="stepexpand"><span>In the Java EE perspective,
-	expand your <a href="ccwebprj.html" title="">dynamic project</a> in the
-	Project Explorer view.</span></li>
+<li class="stepexpand"><span>From the Java EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span></li>
 
-	<li class="stepexpand"><span>Right click on the <strong>Listener</strong>
-	icon, and select <span class="menucascade"> <span
-		class="uicontrol">New</span> &gt; <span class="uicontrol">Listener</span></span>
-	from the pop-up menu.</span> The <span class="uicontrol">Create Listener</span>
-	wizard appears.</li>
+<li class="stepexpand"><span>Right click on the <strong>Listener</strong> icon, and select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Listener</span></span> from the pop-up menu.</span>  The <span class="uicontrol">Create Listener</span> wizard appears.</li>
 
-	<li class="stepexpand"><span>Follow the project wizard
-	prompts.</span></li>
+<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
 
 </ol>
 
-<div class="section">
-<p><strong>General Information</strong></p>
-<dl>
+<div class="section"><dl>
+<dt class="dlterm">Application lifecycle listeners</dt>
 
-	<p>
-	<dt class="dlterm">Application lifecycle listeners</dt>
-	</p>
+<dd>The <cite>Sun Microsystems Java™ Servlet 2.3 Specification</cite>defines the 	following interfaces that represent that application lifecycle 	listeners. You should select at least one of the intefaces. 	<ul>
+<li><strong>javax.servlet.ServletContextListener:</strong> This interface is provided by javax.servlet package and can be used to listen to the ServletContext life-cycle events. This interface has two methods: contextInitialized and contextDestroyed. The <strong><em>contextInitialized</em></strong> method is called when the web application is ready to service requests and the <strong><em>contextDestroyed</em></strong> method is invoked when the servlet context is about to be shut down.</li>
 
-	<dd>The <cite>Sun Microsystems Java Servlet Specification</cite> defines the
-	following interfaces that represent that application lifecycle
-	listeners. You should select at least one of the intefaces. 
-	<ul>
-		<li><strong>javax.servlet.ServletContextListener:
-		</strong> This interface is provided by javax.servlet package and can be used
-		to listen to the ServletContext life-cycle events. This interface has
-		two methods: contextInitialized and contextDestroyed. The
-		<b><i>contextInitialized</i></b> method is called when the web application is ready
-		to service requests and the <b><i>contextDestroyed</i></b> method is invoked when
-		the servlet context is about to be shut down.</li>
-		<li><strong>javax.servlet.ServletContextAttributeListener:
-		</strong> This interface is provided by javax.servlet package. It can be used
-		to be notified when any attribute is added to the ServletContext or if
-		any of the ServletContext's attributes are changed or removed. This
-		inetface has three methods: <b><i>attributeAdded, attributeRemoved</i></b> and
-		<b><i>attributeReplaced</i></b>.</li>
-		<li><strong>javax.servlet.ServletRequestListener:
-		</strong> This interface is provided by javax.servlet package. It can be used
-		to be notified when a request is coming in or out of scope in a Web
-		component. This interface has two methods: requestInitialized and
-		requestDestroyed. The <b><i>requestInitialized</i></b> method is called when it is
-		about to enter the first servlet or filter in each Web application. The <b><i>requestDestroyed</i></b> method is called when it exits the last servlet
-		or the first filter in the chain.</li>
-		<li><strong>javax.servlet.ServletRequestAttributeListener:
-		</strong> This interface is provided by javax.servlet package and can be used
-		to be notified when any request attribute is changed. This interface
-		has three methods: attributeAdded, attributeRemoved and
-		attributeReplaced. The <b><i>attributteAdded</i></b> method is called when a new
-		attribute was added to servlet request. The <b><i>attributeRemoved</i></b> method is
-		called when an existing attribute has been removed from the servlet
-		request. The <b><i>attributeReplaced</i></b> method is called when an attribute
-		was replaced on the servlet request.</li>
-		<li><strong>javax.servlet.http.HttpSessionListener:
-		</strong> This interface is provided by javax.servlet.http package and can be
-		used to listen to a session&apos;s life cycle events. This interface has
-		two methods: sessionCreated and sessionDestroyed. The <b><i>sessionCreated</i></b>
-		method is called when an HttpSession object is created. The
-		<b><i>sessionDestroyed</i></b> method is called when an HttpSession object is
-		invalidated.</li>
-		<li><strong>javax.servlet.http.HttpSessionActivationListener:
-		</strong> This interface is provided by javax.servlet.http package. It can be
-		used to listen to a container events notifying that sessions will be
-		passivated or activated. This interface has two methods:
-		sessionDidActivate and sessionWillPasivate. The <b><i>sessionDidActivate</i></b> is
-		called when the session has just been activated and the
-		<b><i>sessionWillPasivate</i></b> is called when the session is about to be
-		passivated.</li>
-		<li><strong>javax.servlet.http.HttpSessionAttributeListener:
-		</strong> This interface is provided by javax.servlet.http package and can be
-		used to listen to events related to session attributes. This interface
-		has three methods: attributeAdded, attributeRemoved and
-		attributeReplaced. The <b><i>attributeAdded</i></b> method is called when an
-		attribute is added to an HttpSession object. The <b><i>attributeRemoved</i></b> and
-		<b><i>attributeReplaced</i></b> methods are called when an HttpSession attribute is
-		removed or replaced, respectively.</li>
-		<li><strong>javax.servlet.http.HttpSessionBindingListener:
-		</strong> This interface is provided by javax.servlet.http package and can be
-		used to be notified when an object is bound to or unbound from a
-		session. This interface has two methods: valueBound and valueUnbound.
-		The <b><i>valueBound</i></b> method is called when the object is being bound to a
-		session and identifies the session. The <b><i>valueUnbound</i></b> method is called
-		when the object is being unbound from a session and identifies the
-		session.</li>
-	</ul>
-	</dd>
+<li><strong>javax.servlet.ServletContextAttributeListener:</strong> This interface is provided by javax.servlet package. It can be used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. This inetface has three methods: <strong><em>attributeAdded, attributeRemoved</em></strong> and <strong><em>attributeReplaced</em></strong>.</li>
 
-	<p>
-	<dt class="dlterm">Modifiers</dt>
-	</p>
+<li><strong>javax.servlet.ServletRequestListener:</strong> This interface is provided by javax.servlet package. It can be used to be notified when a request is coming in or out of scope in a Web component. This interface has two methods: requestInitialized and requestDestroyed. The <strong><em>requestInitialized</em></strong> method is called when it is about to enter the first servlet or filter in each Web application. The <strong><em>requestDestroyed</em></strong> method is called when it exits the last servlet or the first filter in the chain.</li>
 
-	<dd>The <cite>Sun Microsystems Java Servlet Specification</cite> states that a
-	Listener class must be <b>public</b> and not <b>abstract</b>. Therefore,
-	you cannot change these modifiers. The only one available for change is
-	the <b>final</b> modifier. </dd>
+<li><strong>javax.servlet.ServletRequestAttributeListener:</strong> This interface is provided by javax.servlet package and can be used to be notified when any request attribute is changed. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <strong><em>attributteAdded</em></strong> method is called when a new attribute was added to servlet request. The <strong><em>attributeRemoved</em></strong> method is called when an existing attribute has been removed from the servlet request. The <strong><em>attributeReplaced</em></strong> method is called when an attribute was replaced on the servlet request.</li>
 
-	<p>
-	<dt class="dlterm">Interfaces</dt>
-	</p>
+<li><strong>javax.servlet.http.HttpSessionListener:</strong> This interface is provided by javax.servlet.http package and can be used to listen to a sessions life cycle events. This interface has two methods: sessionCreated and sessionDestroyed. The <strong><em>sessionCreated</em></strong>  	method is called when an HttpSession object is created. The <strong><em>sessionDestroyed</em></strong> method is called when an HttpSession object is invalidated.</li>
 
-	<dd>The interfaces that you selected in the previous page of the wizard
-	are provided as default values in the <b>Interfaces</b> field. To add
-	additional interfaces, click the <b>Add</b> button next to this field.</dd>
+<li><strong>javax.servlet.http.HttpSessionActivationListener:</strong> This interface is provided by javax.servlet.http package. It can be used to listen to a container events notifying that sessions will be passivated or activated. This interface has two methods: sessionDidActivate and sessionWillPasivate. The <strong><em>sessionDidActivate</em></strong> is called when the session has just been activated and the <strong><em>sessionWillPasivate</em></strong> is called when the session is about to be passivated.</li>
 
-	<p>
-	<dt class="dlterm">Interfaces dialog</dt>
-	</p>
+<li><strong>javax.servlet.http.HttpSessionAttributeListener:</strong> This interface is provided by javax.servlet.http package and can be used to listen to events related to session attributes. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <strong><em>attributeAdded</em></strong> method is called when an attribute is added to an HttpSession object. The <strong><em>attributeRemoved</em></strong> and <strong><em>attributeReplaced</em></strong> methods are called when an HttpSession attribute is removed or replaced, respectively.</li>
 
-	<dd>This dialog appears if you select to add an interface to your
-	servlet. As you type the name of the interface that you are adding, a
-	list of available interfaces listed in the <b>Matching items</b> list box
-	updates dynamically to display only the interfaces that match the
-	pattern. Choose an interface to see the qualifier, and then click <b>OK</b>
-	when finished.</dd>
+<li><strong>javax.servlet.http.HttpSessionBindingListener:</strong> This interface is provided by javax.servlet.http package and can be used to be notified when an object is bound to or unbound from a session. This interface has two methods: valueBound and valueUnbound. The <strong><em>valueBound</em></strong> method is called when the object is being bound to a session and identifies the session. The <strong><em>valueUnbound</em></strong> method is called when the object is being unbound from a session and identifies the session.</li>
+
+</ul>
+ 	</dd>
+
+
+<dt class="dlterm">Modifiers</dt>
+
+<dd>The <cite>Sun Microsystems Java Servlet 2.3 Specification</cite> states that a 	Listener class must be <strong>public</strong> and not <strong>abstract</strong>. Therefore, 	you cannot change these modifiers. The only one available for change is 	the <strong>final</strong> modifier.</dd>
+
+
+<dt class="dlterm">Interfaces</dt>
+
+<dd>The interfaces that you selected in the previous page of the wizard 	are provided as default values in the <strong>Interfaces</strong> field. To add 	additional interfaces, click the <strong>Add</strong> button next to this field.</dd>
+
+
+<dt class="dlterm">Interface selection dialog</dt>
+
+<dd>This dialog appears if you select to add an interface to your 	servlet. As you type the name of the interface that you are adding, a 	list of available interfaces listed in the <strong>Matching items</strong> list box 	updates dynamically to display only the interfaces that match the 	pattern. Choose an interface to see the qualifier, and then click <strong>OK</strong> 	when finished.</dd>
 
 </dl>
 </div>
 
 </div>
+
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cwlistbn.html">Listeners</a></div>
+</div>
+</div>
+
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
index 1adb8d6..511bd33 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
@@ -5,9 +5,11 @@
 <task id="twplib" xml:lang="en-us">

 <title>Adding Web library projects</title>

 <prolog><metadata>

-<keywords><indexterm>Web library projects<indexterm>virtual JAR files and

-projects</indexterm></indexterm><indexterm>virtual JAR files associations<indexterm>Web

-library projects</indexterm></indexterm></keywords>

+<keywords><indexterm keyref="twplib|1|WeblibraryprojectsvirtualJARfilesandprojects"

+status="changed">Web projects<indexterm>virtual JAR files and projects</indexterm></indexterm>

+<indexterm keyref="twplib|2|virtualJARfilesassociationsWeblibraryprojects"

+status="new">virtual JAR files associations<indexterm>Web library projects</indexterm></indexterm>

+</keywords>

 </metadata></prolog>

 <taskbody>

 <context> <p>Web library projects allow you to associate <tm tmclass="special"

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
index 846e370..e4987c7 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
@@ -9,8 +9,8 @@
 <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 Web library projects" />
-<meta content="Web library projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="DC.subject" />
-<meta content="Web library projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="keywords" />
+<meta content="Web projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="DC.subject" />
+<meta content="Web projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="keywords" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="twplib" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
index aa90f92..83e1f6a 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
+++ b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
@@ -32,20 +32,17 @@
 <topic label="Creating JavaServer Pages (JSP) files" href="topics/tjcrejsp.html">
 <topic label="JavaServer Pages (JSP) technology" href="topics/cpdjsps.html"/>
 </topic>
+<topic label="Creating Web Artifacts" href="topics/cwebartifact.html">
+<topic label="Creating servlets" href="topics/twsrvwiz.html">
+<topic label="Servlets" href="topics/cwservbn.html"/>
 </topic>
-<topic href="topics/cwebartifact.html" label="Creating Web artifacts">
-   <topic href="topics/twsrvwiz.html" label="Creating Servlets">
-      <topic href="topics/cwservbn.html" label="Servlets">
-      </topic>
-   </topic>
-   <topic href="topics/twfltwiz.html" label="Creating Filters">
-      <topic href="topics/cwfiltbn.html" label="Filters">
-      </topic>
-   </topic>
-   <topic href="topics/twlstwiz.html" label="Creating Listeners">
-      <topic href="topics/cwlistbn.html" label="Listeners">
-      </topic>
-   </topic>
+<topic label="Creating Listeners" href="topics/twlstwiz.html">
+<topic label="Listeners" href="topics/cwlistbn.html"/>
+</topic>
+<topic label="Creating Filters" href="topics/twfltwiz.html">
+<topic label="Listeners" href="topics/cwfiltbn.html"/>
+</topic>
+</topic>
 </topic>
 <topic label="Setting CVS repository defaults" href="topics/twcvsr.html"/>
 <topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>