[225830] adding more java EE documentation. Updating index. Pre-built search index.

53 files changed, 1211 insertions, 252 deletions

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
new file mode 100644
index 000000000..196f729d8
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

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

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

+ "concept.dtd">

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

+<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 support for annotations</title>

+<shortdesc outputclass="id_shortdesc">The goal of <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 platform development is to minimize

+the number of artifacts that you have to create and maintain, thereby simplifying

+the development process. <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 supports the injection of annotations

+into your source code, so that you can embed resources, dependencies, services,

+and life-cycle notifications in your source code, without having to maintain

+these artifacts elsewhere.</shortdesc>

+<prolog><metadata>

+<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm></indexterm>

+</keywords>

+</metadata></prolog>

+<conbody>

+<p>An annotation is a modifier or Metadata tag that provides additional data

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

+interfaces, constructors, methods, fields, parameters, and local variables.

+Annotations replace boilerplate code, common code that is required by certain

+applications. For example, an annotation can replace the paired interface

+and implementation required for a Web service. Annotations can also replace

+additional files that programs require, which are maintained separately. By

+using an annotation, this separate file is no longer required. For example,

+annotations can replace the need for a separately maintained deployment descriptor

+for <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm>. </p>

+<p>Annotations<ul>

+<li>Replace descriptors for most purposes</li>

+<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>

+<li>Allow application settings to be visible in the component they affect</li>

+</ul></p>

+<p>Java EE 5 provides annotations for the following tasks, among others:<ul>

+<li>Developing Enterprise JavaBean applications</li>

+<li>Defining and using Web services</li>

+<li>Mapping Java technology classes to XML</li>

+<li>Mapping Java technology classes to databases</li>

+<li>Mapping methods to operations</li>

+<li>Specifying external dependencies</li>

+<li>Specirying deployment information, including security attributes</li>

+</ul></p>

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

+5 defines a number of annotations that can be injected into your source code.

+To declare an annotation, you simply precede the keyword with an "at" sign

+(@). <codeblock>

+package com.ibm.counter;

+

+import javax.ejb.Stateless;

+

+@Stateless

+

+public class CounterBean {

+

+}</codeblock></p>

+<p>For more information about the categories of annotations that <tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE

+5 supports, see <xref href="ctypesofanno.dita">Types of annotations</xref>.</p>

+</conbody>

+</concept>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
new file mode 100644
index 000000000..029ce1ac9
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
@@ -0,0 +1,109 @@
+<?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, 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 content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Java EE 5 support for annotations" />
+<meta name="abstract" content="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
+<meta name="description" content="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
+<meta content="Java EE 5, annotations" name="DC.subject" />
+<meta content="Java EE 5, annotations" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cjavaee5" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Java EE 5 support for annotations</title>
+</head>
+<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
+
+
+<h1 class="id_title">Java EE 5 support for annotations</h1>
+
+
+
+<div><p class="id_shortdesc">The goal of Java™ EE 5 platform development is to minimize
+the number of artifacts that you have to create and maintain, thereby simplifying
+the development process. Java EE 5 supports the injection of annotations
+into your source code, so that you can embed resources, dependencies, services,
+and life-cycle notifications in your source code, without having to maintain
+these artifacts elsewhere.</p>
+
+<p>An annotation is a modifier or Metadata tag that provides additional data
+to Java classes,
+interfaces, constructors, methods, fields, parameters, and local variables.
+Annotations replace boilerplate code, common code that is required by certain
+applications. For example, an annotation can replace the paired interface
+and implementation required for a Web service. Annotations can also replace
+additional files that programs require, which are maintained separately. By
+using an annotation, this separate file is no longer required. For example,
+annotations can replace the need for a separately maintained deployment descriptor
+for JavaBeans™. </p>
+
+<div class="p">Annotations<ul>
+<li>Replace descriptors for most purposes</li>
+
+<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
+
+<li>Allow application settings to be visible in the component they affect</li>
+
+</ul>
+</div>
+
+<div class="p">Java EE 5 provides annotations for the following tasks, among others:<ul>
+<li>Developing Enterprise JavaBean applications</li>
+
+<li>Defining and using Web services</li>
+
+<li>Mapping Java technology classes to XML</li>
+
+<li>Mapping Java technology classes to databases</li>
+
+<li>Mapping methods to operations</li>
+
+<li>Specifying external dependencies</li>
+
+<li>Specirying deployment information, including security attributes</li>
+
+</ul>
+</div>
+
+<div class="p">Java EE
+5 defines a number of annotations that can be injected into your source code.
+To declare an annotation, you simply precede the keyword with an "at" sign
+(@). <pre>
+package com.ibm.counter;
+
+import javax.ejb.Stateless;
+
+@Stateless
+
+public class CounterBean {
+
+}</pre>
+</div>
+
+<p>For more information about the categories of annotations that Java EE
+5 supports, see <a href="ctypesofanno.html">Types of annotations</a>.</p>
+
+</div>
+
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/tdefiningannotations.html">Defining and using annotations</a></strong><br />
+You can use the @Interface annotation to define your own annotation definition.</li>
+</ul>
+
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE 5 Applications</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
index c415b7cc7..11b05780d 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
@@ -5,9 +5,9 @@
 <concept id="cfacets" xml:lang="en-us">

 <title outputclass="id_title">Project facets</title>

 <shortdesc outputclass="id_shortdesc">Facets define characteristics and requirements

-for J2EE projects and are used as part of the runtime configuration. </shortdesc>

+for Java EE projects and are used as part of the runtime configuration. </shortdesc>

 <prolog><metadata>

-<keywords><indexterm>J2EE<indexterm>project facets</indexterm></indexterm>

+<keywords><indexterm>Java EE<indexterm>project facets</indexterm></indexterm>

 <indexterm>JavaServer Faces (JSF)<indexterm>project facets</indexterm></indexterm>

 <indexterm>projects<indexterm>facets<indexterm>overview</indexterm></indexterm></indexterm>

 </keywords>

@@ -19,9 +19,9 @@ to perform a certain task, fulfill certain requirements, or have certain charact
 For example, the EAR facet sets up a project to function as an enterprise

 application by adding a deployment descriptor and setting up the project's

 classpath.</p>

-<p>You can add facets only to J2EE projects and other types of projects that

-are based on J2EE projects, such as enterprise application projects, dynamic

-Web projects, and EJB projects. You cannot add facets to a <tm tmclass="special"

+<p>You can add facets only to Java EE projects and other types of projects

+that are based on J2EE projects, such as enterprise application projects,

+dynamic Web projects, and EJB projects. You cannot add facets to a <tm tmclass="special"

 tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project

 or plug-in project, for example. Typically, a facet-enabled project has at

 least one facet when it is created, allowing you to add more facets if necessary.

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
index 82b49b4da..ae958e498 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
@@ -9,14 +9,17 @@
 <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 facets" />
-<meta name="abstract" content="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration." />
-<meta name="description" content="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration." />
-<meta content="J2EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
-<meta content="J2EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta name="abstract" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
+<meta name="description" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
+<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
+<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cfacets" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -31,7 +34,7 @@
 
 
 <div class="id_conbody"><p class="id_shortdesc">Facets define characteristics and requirements
-for J2EE projects and are used as part of the runtime configuration. </p>
+for Java EE projects and are used as part of the runtime configuration. </p>
 
 <p class="anchor_topictop" />
 
@@ -41,14 +44,14 @@ For example, the EAR facet sets up a project to function as an enterprise
 application by adding a deployment descriptor and setting up the project's
 classpath.</p>
 
-<p>You can add facets only to J2EE projects and other types of projects that
-are based on J2EE projects, such as enterprise application projects, dynamic
-Web projects, and EJB projects. You cannot add facets to a Java™ project
+<p>You can add facets only to Java EE projects and other types of projects
+that are based on J2EE projects, such as enterprise application projects,
+dynamic Web projects, and EJB projects. You cannot add facets to a Java™ project
 or plug-in project, for example. Typically, a facet-enabled project has at
 least one facet when it is created, allowing you to add more facets if necessary.
 For example, a new EJB project has the EJB Module facet. You can then add
 other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <a href="taddingfacet.html" title="This topic explains how to add a facet&#10;to an existing project in your workspace.">Adding a facet to a J2EE project</a>.</p>
+facet to a project, see <a href="taddingfacet.html" title="This topic explains how to add a facet&#10;to an existing project in your workspace.">Adding a facet to a Java EE project</a>.</p>
 
 <p>Some facets require other facets as prerequisites. Other facets cannot
 be in the same project together. For example, you cannot add the Dynamic Web
@@ -57,24 +60,22 @@ Module facet. Some facets can be removed from a project and others cannot.</p>
 
 <p>Facets also have version numbers. You can change the version numbers of
 facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <a href="tchangefacet.html" title="You can change the version of a facet&#10;in a J2EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
+the version number of a facet, see <a href="tchangefacet.html" title="You can change the version of a facet&#10;in a Java EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
 
 <p class="anchor_topicbottom" />
 
 </div>
 
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/taddingfacet.html">Adding a facet to a J2EE project</a></strong><br />
-This topic explains how to add a facet to an existing project in your workspace.</li>
-<li class="ulchildlink"><strong><a href="../topics/tchangefacet.html">Changing the version of a facet</a></strong><br />
-You can change the version of a facet in a J2EE project by editing the facets for the project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tchangejavalevel.html">Changing the Java compiler version for a J2EE project</a></strong><br />
-You can change the version of Java used in a J2EE project by changing the value of the Java facet.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
+<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
+<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
+<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
index d9c651a7c..92d44a010 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
@@ -9,7 +9,7 @@ programs that run on networked client systems so the project can benefit from
 a server's tools.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>application client projects<indexterm>overview</indexterm></indexterm>

-<indexterm>J2EE<indexterm>application client projects</indexterm></indexterm>

+<indexterm>Java EE<indexterm>application client projects</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <conbody outputclass="id_conbody">

@@ -18,11 +18,11 @@ a server's tools.</shortdesc>
 client modules. An application client module is used to contain a full-function

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

 trademark="Java">Java</tm> application (non Web-based) that connects to and

-uses the J2EE resources defined in your server. When you place the client

+uses the Java EE resources defined in your server. When you place the client

 code in an application client module instead of a simple JAR file, the application

 client benefits from the server's resources (it does not need to re-specify

-the class path to J2EE and server JAR files) as well as from easier JNDI lookup

-(the client container fills in the initial context and other parameters).

+the class path to Java EE and server JAR files) as well as from easier JNDI

+lookup (the client container fills in the initial context and other parameters).

 The application client project allows you to work as if you are creating a

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

 trademark="Java">Java</tm> application in a <tm tmclass="special" tmowner="Sun Microsystems, Inc."

@@ -61,12 +61,13 @@ tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">
 files, and deployment descriptor information and any meta-data extensions

 and bindings files.</p>

 <p>Application client projects are typically run on networked client systems

-connected to J2EE (EJB) servers. The point of entry for the application client

-is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> main-class,

-which is simply a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> class that contains a static main method. The class

-is declared in the manifest file of the client module. </p>

-<p>A J2EE application client container provides access to the J2EE service

+connected to Java EE (EJB) servers. The point of entry for the application

+client is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

+trademark="Java">Java</tm> main-class, which is simply a <tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class

+that contains a static main method. The class is declared in the manifest

+file of the client module. </p>

+<p>A Java EE application client container provides access to the Java EE service

 (JNDI naming services, deployment services, transaction services, and security

 services) and communications APIs (internet protocols, Remote Method Invocation

 protocols, Object Management Group protocols, Messaging protocols, and data

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
index fceb834d9..984877014 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
@@ -11,9 +11,12 @@
 <meta name="DC.Title" content="Application client projects" />
 <meta name="abstract" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
 <meta name="description" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta content="application client projects, overview, J2EE" name="DC.subject" />
-<meta content="application client projects, overview, J2EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta content="application client projects, overview, Java EE" name="DC.subject" />
+<meta content="application client projects, overview, Java EE" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjappcliproj" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -36,11 +39,11 @@ a server's tools.</p>
 <p> Application client projects contain the resources needed for application
 client modules. An application client module is used to contain a full-function
 client Java™ application (non Web-based) that connects to and
-uses the J2EE resources defined in your server. When you place the client
+uses the Java EE resources defined in your server. When you place the client
 code in an application client module instead of a simple JAR file, the application
 client benefits from the server's resources (it does not need to re-specify
-the class path to J2EE and server JAR files) as well as from easier JNDI lookup
-(the client container fills in the initial context and other parameters).
+the class path to Java EE and server JAR files) as well as from easier JNDI
+lookup (the client container fills in the initial context and other parameters).
 The application client project allows you to work as if you are creating a
 standalone Java application in a Java project.</p>
 
@@ -78,12 +81,12 @@ files, and deployment descriptor information and any meta-data extensions
 and bindings files.</p>
 
 <p>Application client projects are typically run on networked client systems
-connected to J2EE (EJB) servers. The point of entry for the application client
-is a Java main-class,
-which is simply a Java class that contains a static main method. The class
-is declared in the manifest file of the client module. </p>
+connected to Java EE (EJB) servers. The point of entry for the application
+client is a Java main-class, which is simply a Java class
+that contains a static main method. The class is declared in the manifest
+file of the client module. </p>
 
-<p>A J2EE application client container provides access to the J2EE service
+<p>A Java EE application client container provides access to the Java EE service
 (JNDI naming services, deployment services, transaction services, and security
 services) and communications APIs (internet protocols, Remote Method Invocation
 protocols, Object Management Group protocols, Messaging protocols, and data
@@ -97,9 +100,13 @@ along with all the meta-data files in the <span class="uicontrol">META-INF</span
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
+<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
index f66fe2730..c321ffc10 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
@@ -13,7 +13,14 @@
 <meta name="description" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
 <meta content="J2EE, architecture, Java EE" name="DC.subject" />
 <meta content="J2EE, architecture, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjarch" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -78,9 +85,17 @@ download and read the <a href="http://java.sun.com/j2ee/download.html#platformsp
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
+<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
+<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
new file mode 100644
index 000000000..1e5e146a6
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

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

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

+ "concept.dtd">

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

+<title outputclass="id_title">Developing <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 Applications</title>

+<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 programming model simplifies the

+process of creating <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> applications.</shortdesc>

+<prolog><metadata>

+<keywords><indexterm>Java Enterprise Edition 5<indexterm>Overview</indexterm></indexterm>

+</keywords>

+</metadata></prolog>

+<conbody outputclass="id_conbody">

+<p outputclass="anchor_topictop"></p>

+<p id="aboutfacet">In the Java EE 5 specifications, programming requirements

+have been streamlined, and XML deployment descriptors are optional. Instead,

+you can specify many details of assembly and deployment with Java annotations.

+Java EE 5 will provide default values in many situations so explicitly specification

+of these values are not required.</p>

+<p>Code validation, content assistance, Quick Fixes, and refactoring simplify

+working with your code. Code validators check your projects for errors. When

+an error is found, you can double-click on it in the Problems view in the

+product workbench to go to the error location. For some error types, you can

+use a Quick Fix to correct the error automatically. For both <tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source

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

+you can rely on content assistance to simplify your programming task. When

+you refactor source code, the tools automatically update the associated metadata.</p>

+<p>For additional information on <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5.0, see the official specification: <xref

+href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Platform,

+Enterprise Edition 5 (<tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></p>

+<p outputclass="anchor_topicbottom"></p>

+</conbody>

+</concept>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
new file mode 100644
index 000000000..d70c2c6dd
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
@@ -0,0 +1,72 @@
+<?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, 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 content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Developing Java EE 5 Applications" />
+<meta name="abstract" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
+<meta name="description" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
+<meta content="Java Enterprise Edition 5, Overview" name="DC.subject" />
+<meta content="Java Enterprise Edition 5, Overview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjee5overview.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cjavaee5" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Developing Java EE 5 Applications</title>
+</head>
+<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
+
+
+<h1 class="id_title">Developing Java EE 5 Applications</h1>
+
+
+
+<div class="id_conbody"><p class="id_shortdesc">The Java™ EE 5 programming model simplifies the
+process of creating Java applications.</p>
+
+<p class="anchor_topictop" />
+
+<p id="cjavaee5__aboutfacet"><a name="cjavaee5__aboutfacet"><!-- --></a>In the Java EE 5 specifications, programming requirements
+have been streamlined, and XML deployment descriptors are optional. Instead,
+you can specify many details of assembly and deployment with Java annotations.
+Java EE 5 will provide default values in many situations so explicitly specification
+of these values are not required.</p>
+
+<p>Code validation, content assistance, Quick Fixes, and refactoring simplify
+working with your code. Code validators check your projects for errors. When
+an error is found, you can double-click on it in the Problems view in the
+product workbench to go to the error location. For some error types, you can
+use a Quick Fix to correct the error automatically. For both Java source
+and Java annotations,
+you can rely on content assistance to simplify your programming task. When
+you refactor source code, the tools automatically update the associated metadata.</p>
+
+<p>For additional information on Java EE 5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
+
+<p class="anchor_topicbottom" />
+
+</div>
+
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/cjee5overview.html">Java EE 5: Overview</a></strong><br />
+Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues.</li>
+<li class="ulchildlink"><strong><a href="../topics/cannotations.html">Java EE 5 support for annotations</a></strong><br />
+The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.</li>
+</ul>
+
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
index d4be75971..3f4ab564f 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
@@ -3,13 +3,13 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

  "concept.dtd">

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

-<title outputclass="id_title">Cyclical dependencies between J2EE modules</title>

+<title outputclass="id_title">Cyclical dependencies between Java EE modules</title>

 <shortdesc outputclass="id_shortdesc">A cyclical dependency between two or

 more modules in an enterprise application most commonly occurs when projects

 are imported from outside the Workbench.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>dependencies<indexterm>cycles between modules</indexterm></indexterm>

-<indexterm>J2EE<indexterm>cyclical dependencies between modules</indexterm></indexterm>

+<indexterm>Java EE<indexterm>cyclical dependencies between modules</indexterm></indexterm>

 <indexterm>projects<indexterm>cyclical dependencies</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
index 3aeb5f3ee..6ba2fe21a 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
@@ -8,22 +8,23 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Cyclical dependencies between J2EE modules" />
+<meta name="DC.Title" content="Cyclical dependencies between Java EE modules" />
 <meta name="abstract" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
 <meta name="description" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta content="dependencies, cycles between modules, J2EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
-<meta content="dependencies, cycles between modules, J2EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
+<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjcircle" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Cyclical dependencies between J2EE modules</title>
+<title>Cyclical dependencies between Java EE modules</title>
 </head>
 <body id="cjcircle"><a name="cjcircle"><!-- --></a>
 
 
-<h1 class="id_title">Cyclical dependencies between J2EE modules</h1>
+<h1 class="id_title">Cyclical dependencies between Java EE modules</h1>
 
 
 
@@ -47,9 +48,9 @@ factored and layered application.</p>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
+<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
index 2a3970af2..3766138f2 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
@@ -13,7 +13,14 @@
 <meta name="description" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
 <meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="DC.subject" />
 <meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjearproj" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -82,7 +89,7 @@ This file is created in the <span class="uicontrol">.settings</span> folder.</dd
 
 <dt class="dlterm">.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
 
-<dd>This file lists the facets of the enterprise application project. See <a href="cfacets.html" title="Facets define characteristics and requirements&#10;for J2EE projects and are used as part of the runtime configuration. ">Project facets</a>. This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
+<dd>This file lists the facets of the enterprise application project. See <a href="cfacets.html" title="Facets define characteristics and requirements&#10;for Java EE projects and are used as part of the runtime configuration. ">Project facets</a>. This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
 
 
 <dt class="dlterm">.project</dt>
@@ -96,9 +103,16 @@ This file is created in the <span class="uicontrol">.settings</span> folder.</dd
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
+<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
new file mode 100644
index 000000000..0d62b190c
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>

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

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

+ "concept.dtd">

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

+<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5: Overview</title>

+<shortdesc outputclass="id_shortdesc">Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition (<tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE)

+architecture, you can build distributed Web and enterprise applications. This

+architecture helps you focus on presentation and application issues, rather

+than on systems issues.</shortdesc>

+<prolog><metadata>

+<keywords><indexterm>Java EE 5</indexterm><indexterm>Oerview</indexterm></keywords>

+</metadata></prolog>

+<conbody>

+<p>You can use the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 tools and features to create applications

+that are structured around modules with different purposes, such as Web sites

+and Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

+trademark="JavaBeans">JavaBeans</tm> (EJB) applications. When you use EJB

+3.0 components, you can create a distributed, secure application with transactional

+support. When you develop applications that access persistent data, you can

+use the new <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

+trademark="Java">Java</tm> Persistence API (JPA). This standard simplifies

+the creation and use of persistent entities, as well as adding new features.

+For developing presentation logic, you can use technologies such as JavaServer

+Pages (JSP) or JavaServer Faces (JSF).</p>

+<p>Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

+trademark="Java">Java</tm> EE 5 Platform Enterprise Edition (Java EE) , you

+can develop applications more quickly and conveniently than in previous versions.

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

+5 platform replaces <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> 2 Enterprise Edition (J2EE), version

+1.4. The product tools support for both versions. Java EE 5 significantly

+enhances ease of use providing<ul>

+<li>Reduced development time</li>

+<li>Reduced application complexity</li>

+<li>Improved application performance</li>

+</ul></p>

+<p>Java EE 5 provides a simplified programming model, including the following

+tools:<ul>

+<li>Inline configuration with annotations, making deployment descriptors now

+optional</li>

+<li>Dependency injection, hiding resource creation and lookup from application

+code</li>

+<li>Java persistence API (JPA) allows data management without explicit SQL

+or JDBC</li>

+<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web

+services</li>

+</ul></p>

+<p>Java EE 5 provides simplified packaging rules for enterprise applications:<ul>

+<li>Web applications us .WAR files</li>

+<li>Resource adapters use .RAR files</li>

+<li>Enterprise applications use .EAR files</li>

+<li>The <codeph>lib</codeph> directory contains shared .JAR files</li>

+<li>A .JAR file with <codeph>Main-Class</codeph> implies an application client</li>

+<li>A .JAR file with @Stateless annotation implies an EJB application</li>

+<li>Many simple applications no longer require deployment descriptors, including<ul>

+<li>EJB applications (.JAR files)</li>

+<li>Web applications that use JSP technology only</li>

+<li>Application clients</li>

+<li>Enterprise applications (.EAR files)</li>

+</ul></li>

+</ul></p>

+<p>Java EE 5 provides simplified resource access using dependency injection:<ul>

+<li>In the Dependency Injection pattern, an external entity automatically

+supplies an object's dependencies.<ul>

+<li>The object need not request these resources explicitly</li>

+</ul></li>

+<li>In Java EE 5, dependency injection can be applied to all resources that

+a component needs<ul>

+<li>Creation and lookup of resources are hidden from application code</li>

+</ul></li>

+<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>

+<li>EJB containers</li>

+<li>Web containers</li>

+<li>Clients</li>

+<li>Web services</li>

+</ul></li>

+</ul></p>

+</conbody>

+</concept>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
new file mode 100644
index 000000000..3cb28f3a7
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
@@ -0,0 +1,144 @@
+<?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, 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 content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Java EE 5: Overview" />
+<meta name="abstract" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
+<meta name="description" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
+<meta content="Java EE 5, Oerview" name="DC.subject" />
+<meta content="Java EE 5, Oerview" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cjavaee5" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Java EE 5: Overview</title>
+</head>
+<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
+
+
+<h1 class="id_title">Java EE 5: Overview</h1>
+
+
+
+<div><p class="id_shortdesc">Using the Java™ Platform, Enterprise Edition (Java EE)
+architecture, you can build distributed Web and enterprise applications. This
+architecture helps you focus on presentation and application issues, rather
+than on systems issues.</p>
+
+<p>You can use the Java EE 5 tools and features to create applications
+that are structured around modules with different purposes, such as Web sites
+and Enterprise JavaBeans™ (EJB) applications. When you use EJB
+3.0 components, you can create a distributed, secure application with transactional
+support. When you develop applications that access persistent data, you can
+use the new Java Persistence API (JPA). This standard simplifies
+the creation and use of persistent entities, as well as adding new features.
+For developing presentation logic, you can use technologies such as JavaServer
+Pages (JSP) or JavaServer Faces (JSF).</p>
+
+<div class="p">Using the Java EE 5 Platform Enterprise Edition (Java EE) , you
+can develop applications more quickly and conveniently than in previous versions.
+The Java EE
+5 platform replaces Java 2 Enterprise Edition (J2EE), version
+1.4. The product tools support for both versions. Java EE 5 significantly
+enhances ease of use providing<ul>
+<li>Reduced development time</li>
+
+<li>Reduced application complexity</li>
+
+<li>Improved application performance</li>
+
+</ul>
+</div>
+
+<div class="p">Java EE 5 provides a simplified programming model, including the following
+tools:<ul>
+<li>Inline configuration with annotations, making deployment descriptors now
+optional</li>
+
+<li>Dependency injection, hiding resource creation and lookup from application
+code</li>
+
+<li>Java persistence API (JPA) allows data management without explicit SQL
+or JDBC</li>
+
+<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
+services</li>
+
+</ul>
+</div>
+
+<div class="p">Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
+<li>Web applications us .WAR files</li>
+
+<li>Resource adapters use .RAR files</li>
+
+<li>Enterprise applications use .EAR files</li>
+
+<li>The <samp class="codeph">lib</samp> directory contains shared .JAR files</li>
+
+<li>A .JAR file with <samp class="codeph">Main-Class</samp> implies an application client</li>
+
+<li>A .JAR file with @Stateless annotation implies an EJB application</li>
+
+<li>Many simple applications no longer require deployment descriptors, including<ul>
+<li>EJB applications (.JAR files)</li>
+
+<li>Web applications that use JSP technology only</li>
+
+<li>Application clients</li>
+
+<li>Enterprise applications (.EAR files)</li>
+
+</ul>
+</li>
+
+</ul>
+</div>
+
+<div class="p">Java EE 5 provides simplified resource access using dependency injection:<ul>
+<li>In the Dependency Injection pattern, an external entity automatically
+supplies an object's dependencies.<ul>
+<li>The object need not request these resources explicitly</li>
+
+</ul>
+</li>
+
+<li>In Java EE 5, dependency injection can be applied to all resources that
+a component needs<ul>
+<li>Creation and lookup of resources are hidden from application code</li>
+
+</ul>
+</li>
+
+<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
+<li>EJB containers</li>
+
+<li>Web containers</li>
+
+<li>Clients</li>
+
+<li>Web services</li>
+
+</ul>
+</li>
+
+</ul>
+</div>
+
+</div>
+
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE 5 Applications</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
index 5f0468eb9..408bd00e8 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
@@ -11,7 +11,7 @@ that you can use when developing resources for enterprise applications, EJB
 modules, Web modules, application client modules, and connector projects or

 modules.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>J2EE<indexterm>workbench perspectives</indexterm></indexterm>

+<keywords><indexterm>Java EE<indexterm>workbench perspectives</indexterm></indexterm>

 <indexterm>enterprise applications<indexterm>Java EE perspective</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
index ee16b19ed..f44fe0cb9 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
@@ -11,9 +11,9 @@
 <meta name="DC.Title" content="Java EE perspective" />
 <meta name="abstract" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
 <meta name="description" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
-<meta content="J2EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
-<meta content="J2EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
+<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
+<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjpers" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -124,9 +124,8 @@ be cancelled.</dd>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div><div class="relinfo"><strong>Related information</strong><br />
+<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
index 1fb4db218..5938c0d59 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
@@ -13,7 +13,8 @@
 <meta name="description" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
 <meta content="views, Project Explorer" name="DC.subject" />
 <meta content="views, Project Explorer" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
+<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjview" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -56,9 +57,11 @@ groups of related resources or projects. For more information, see <a href="../.
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.">Filtering in the Project Explorer view</a></div>
+</div>
+<div class="relinfo"><strong>Related information</strong><br />
+<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
new file mode 100644
index 000000000..f1288bfe7
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

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

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

+ "concept.dtd">

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

+<title outputclass="id_title">Types of annotations</title>

+<shortdesc outputclass="id_shortdesc"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5 defines a number of types or groups

+of annotations, defined in a number of <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> Specification Requests (JSRs).</shortdesc>

+<prolog><metadata>

+<keywords><indexterm>Java EE 5<indexterm>annotations<indexterm>types</indexterm></indexterm></indexterm>

+</keywords>

+</metadata></prolog>

+<conbody outputclass="id_conbody">

+<p outputclass="anchor_topictop"></p>

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

+5 defines the following types of annotations:</p>

+<ul>

+<li>JSR 250: Common annotations<b></b></li>

+<li>JSR-220: EJB 3.0 annotations</li>

+<li>JSR-181: Web Services annotations</li>

+<li>JSR-220: Java Persistence API annotations</li>

+<li>JSR-222: JaxB annotations</li>

+<li>JSR-224: WS2 annotations</li>

+</ul>

+<p>For additional information on <tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5.0, see the official specification: <xref

+href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm tmclass="special"

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Platform,

+Enterprise Edition 5 (<tm tmclass="special" tmowner="Sun Microsystems, Inc."

+tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></p>

+<p outputclass="anchor_topicbottom"></p>

+</conbody>

+</concept>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
new file mode 100644
index 000000000..5bc623b05
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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 content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="concept" name="DC.Type" />
+<meta name="DC.Title" content="Types of annotations" />
+<meta name="abstract" content="Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
+<meta name="description" content="Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
+<meta content="Java EE 5, annotations, types" name="DC.subject" />
+<meta content="Java EE 5, annotations, types" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="cjavaee5" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Types of annotations</title>
+</head>
+<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
+
+
+<h1 class="id_title">Types of annotations</h1>
+
+
+
+<div class="id_conbody"><p class="id_shortdesc">Java™ EE 5 defines a number of types or groups
+of annotations, defined in a number of Java Specification Requests (JSRs).</p>
+
+<p class="anchor_topictop" />
+
+<p>Java EE
+5 defines the following types of annotations:</p>
+
+<ul>
+<li>JSR 250: Common annotations<strong /></li>
+
+<li>JSR-220: EJB 3.0 annotations</li>
+
+<li>JSR-181: Web Services annotations</li>
+
+<li>JSR-220: Java Persistence API annotations</li>
+
+<li>JSR-222: JaxB annotations</li>
+
+<li>JSR-224: WS2 annotations</li>
+
+</ul>
+
+<p>For additional information on Java EE 5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
+
+<p class="anchor_topicbottom" />
+
+</div>
+
+<div>
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdefiningannotations.html" title="You can use the @Interface annotation to define your own annotation definition.">Defining and using annotations</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
index 7ac450b02..d050edb0f 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
@@ -68,7 +68,7 @@ Connector projects are deployed into RAR files. You can import a connector proje
 </li>
 <li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html">Exporting EJB projects to EJB JAR files</a></strong><br />
 </li>
-<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between J2EE modules</a></strong><br />
+<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between Java EE modules</a></strong><br />
 A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.</li>
 <li class="ulchildlink"><strong><a href="../topics/tjcircleb.html">Correcting cyclical dependencies after an EAR is imported</a></strong><br />
 You can resolve cyclical dependencies after an EAR is imported.</li>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
index 5584b1dd5..5f6b4eb6e 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
@@ -3,10 +3,10 @@
 <!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"

  "topic.dtd">

 <topic id="ph-j2eeapp" xml:lang="en-us">

-<title outputclass="id_title">J2EE applications</title>

+<title outputclass="id_title">Java EE applications</title>

 <shortdesc outputclass="id_shortdesc">These topics deal with the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> 2

-Platform, Enterprise Edition (J2EE).</shortdesc>

+tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Enterprise

+Edition (Java EE).</shortdesc>

 <prolog><metadata>

 <keywords></keywords>

 </metadata></prolog>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
index a4076301e..dacf3faad 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
@@ -8,9 +8,10 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="J2EE applications" />
-<meta name="abstract" content="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE)." />
-<meta name="description" content="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE)." />
+<meta name="DC.Title" content="Java EE applications" />
+<meta name="abstract" content="These topics deal with the Java Enterprise Edition (Java EE)." />
+<meta name="description" content="These topics deal with the Java Enterprise Edition (Java EE)." />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cjpers.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
@@ -22,17 +23,17 @@
 <meta content="ph-j2eeapp" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE applications</title>
+<title>Java EE applications</title>
 </head>
 <body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
 
 
-<h1 class="id_title">J2EE applications</h1>
+<h1 class="id_title">Java EE applications</h1>
 
 
 
-<div class="id_body"><p class="id_shortdesc">These topics deal with the Java™ 2
-Platform, Enterprise Edition (J2EE).</p>
+<div class="id_body"><p class="id_shortdesc">These topics deal with the Java™ Enterprise
+Edition (Java EE).</p>
 
 <p class="anchor_topictop" />
 
@@ -42,6 +43,8 @@ Platform, Enterprise Edition (J2EE).</p>
 
 <div>
 <ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/cjavaee5.html">Developing Java EE 5 Applications</a></strong><br />
+The Java EE 5 programming model simplifies the process of creating Java applications.</li>
 <li class="ulchildlink"><strong><a href="../topics/cjarch.html">J2EE architecture</a></strong><br />
 The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.</li>
 <li class="ulchildlink"><strong><a href="../topics/cjpers.html">Java EE perspective</a></strong><br />
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
index f01ecfd10..14c861f57 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
@@ -58,13 +58,13 @@ A connector is a J2EE standard extension mechanism for containers to provide con
 <li class="ulchildlink"><strong><a href="../topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></strong><br />
 When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects.</li>
 <li class="ulchildlink"><strong><a href="../topics/cfacets.html">Project facets</a></strong><br />
-Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration.</li>
+Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.</li>
 <li class="ulchildlink"><strong><a href="../topics/ph-importexport.html">Importing and exporting projects and files</a></strong><br />
 These topics cover how to import files and projects into the workbench and export files and projects to disk.</li>
 </ul>
 
 <div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
index a2dac8267..3469e9879 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
@@ -48,7 +48,7 @@ This topic outlines current known limitations and restrictions for J2EE tooling.
 </ul>
 
 <div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
index b8eaa0695..f446bac7a 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
@@ -13,7 +13,6 @@
 <meta name="description" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
 <meta content="J2EE, tool limitations" name="DC.subject" />
 <meta content="J2EE, tool limitations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rjlimitcurrent" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -85,11 +84,6 @@ Cancel and reopen the project creation wizard.</div>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
-</div>
-</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
index 8f2942813..d9d30cbae 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
@@ -13,8 +13,8 @@
 <meta name="description" content="This table lists the common error messages you may encounter when you validate your projects." />
 <meta content="code validation, error solutions, validation" name="DC.subject" />
 <meta content="code validation, error solutions, validation" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rvalerr" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -314,13 +314,11 @@ the project.</td>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
 </div>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
+<div class="relref"><strong>Related reference</strong><br />
+<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
index f28957cb9..f2de7834d 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
@@ -13,8 +13,8 @@
 <meta name="description" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
 <meta content="validation, J2EE validators, code validation" name="DC.subject" />
 <meta content="validation, J2EE validators, code validation" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="rvalidators" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -237,13 +237,11 @@ with.</td>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
 </div>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-ref.html" title="The following reference material on J2EE is available:">Reference</a></div>
+<div class="relref"><strong>Related reference</strong><br />
+<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
index ba9f271e2..41da49af6 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
@@ -3,12 +3,13 @@
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

  "task.dtd">

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

-<title outputclass="id_title">Adding a facet to a J2EE project</title>

+<title outputclass="id_title">Adding a facet to a Java EE project</title>

 <shortdesc outputclass="id_shortdesc">This topic explains how to add a facet

 to an existing project in your workspace.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>projects<indexterm>facets<indexterm>adding</indexterm></indexterm></indexterm>

-<indexterm>J2EE<indexterm>adding project facets</indexterm></indexterm></keywords>

+<indexterm>Java EE<indexterm>adding project facets</indexterm></indexterm>

+</keywords>

 </metadata></prolog>

 <taskbody outputclass="id_taskbody">

 <context outputclass="id_context"><p outputclass="anchor_topictop"></p><p

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
index 6fb1d0264..2453d13da 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
@@ -8,22 +8,24 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a facet to a J2EE project" />
+<meta name="DC.Title" content="Adding a facet to a Java EE project" />
 <meta name="abstract" content="This topic explains how to add a facet to an existing project in your workspace." />
 <meta name="description" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta content="projects, facets, adding, J2EE, adding project facets" name="DC.subject" />
-<meta content="projects, facets, adding, J2EE, adding project facets" name="keywords" />
+<meta content="projects, facets, adding, Java EE, adding project facets" name="DC.subject" />
+<meta content="projects, facets, adding, Java EE, adding project facets" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="taddingfacet" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a facet to a J2EE project</title>
+<title>Adding a facet to a Java EE project</title>
 </head>
 <body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
 
 
-<h1 class="id_title">Adding a facet to a J2EE project</h1>
+<h1 class="id_title">Adding a facet to a Java EE project</h1>
 
 
 
@@ -92,9 +94,12 @@ Project dialog and then click <span class="uicontrol">OK</span>.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
+<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
index 252889e39..212244de3 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
@@ -5,17 +5,17 @@
 <task id="tchangefacet" xml:lang="en-us">

 <title outputclass="id_title">Changing the version of a facet</title>

 <shortdesc outputclass="id_shortdesc">You can change the version of a facet

-in a J2EE project by editing the facets for the project.</shortdesc>

+in a Java EE project by editing the facets for the project.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>facets<indexterm>changing versions</indexterm></indexterm>

-<indexterm>J2EE<indexterm>changing facet versions</indexterm></indexterm>

+<indexterm>Java EE<indexterm>changing facet versions</indexterm></indexterm>

 <indexterm>projects<indexterm>changing facet versions</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody outputclass="id_taskbody">

 <context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Changing

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

-version of a J2EE project involves changing the version of the <uicontrol>Java</uicontrol> facet.

+version of a Java EE project involves changing the version of the <uicontrol>Java</uicontrol> facet.

 For more information, see <xref href="tchangejavalevel.dita"></xref>.</p><p>To

 change the version of a facet in your project, complete the following steps:</p></context>

 <steps outputclass="id_steps">

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
index 9d0749576..0b9623007 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
@@ -9,10 +9,12 @@
 <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="Changing the version of a facet" />
-<meta name="abstract" content="You can change the version of a facet in a J2EE project by editing the facets for the project." />
-<meta name="description" content="You can change the version of a facet in a J2EE project by editing the facets for the project." />
-<meta content="facets, changing versions, J2EE, changing facet versions, projects" name="DC.subject" />
-<meta content="facets, changing versions, J2EE, changing facet versions, projects" name="keywords" />
+<meta name="abstract" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
+<meta name="description" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
+<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="DC.subject" />
+<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tchangefacet" name="DC.Identifier" />
@@ -28,13 +30,13 @@
 
 
 <div class="id_taskbody"><p class="id_shortdesc">You can change the version of a facet
-in a J2EE project by editing the facets for the project.</p>
+in a Java EE project by editing the facets for the project.</p>
 
 <div class="id_context"><p class="anchor_topictop" />
  <p>Changing
 the Java™ compiler
-version of a J2EE project involves changing the version of the <span class="uicontrol">Java</span> facet.
-For more information, see <a href="tchangejavalevel.html" title="You can change the version of Java used&#10;in a J2EE project by changing the value of the Java facet.">Changing the Java compiler version for a J2EE project</a>.</p>
+version of a Java EE project involves changing the version of the <span class="uicontrol">Java</span> facet.
+For more information, see <a href="tchangejavalevel.html" title="You can change the version of Java used&#10;in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a>.</p>
 <p>To
 change the version of a facet in your project, complete the following steps:</p>
 </div>
@@ -63,9 +65,12 @@ Project window and then click <span class="uicontrol">OK</span>.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
+<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
index 443530b20..190b0e46a 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
@@ -4,19 +4,19 @@
  "task.dtd">

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

 <title outputclass="id_title">Changing the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> compiler version for a J2EE project</title>

+tmtype="tm" trademark="Java">Java</tm> compiler version for a Java EE project</title>

 <shortdesc outputclass="id_shortdesc">You can change the version of <tm tmclass="special"

 tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> used

-in a J2EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>

+in a Java EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>

 <prolog><metadata>

-<keywords><indexterm>Java<indexterm>J2EE project compiler level</indexterm></indexterm>

+<keywords><indexterm>Java EE<indexterm>project compiler level</indexterm></indexterm>

 <indexterm>projects<indexterm>Java compiler level</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

 <taskbody outputclass="id_taskbody">

 <context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The <uicontrol>Java</uicontrol> facet

 applies only to J2EE projects. To set the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> compiler level of a non-J2EE project,

+tmtype="tm" trademark="Java">Java</tm> compiler level of a non-Java EE project,

 such as a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

 trademark="Java">Java</tm> project, see <xref format="html" href="../../org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm"

 scope="peer"><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
index c4fda4554..1f8a766d5 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
@@ -8,31 +8,33 @@
 <meta content="index,follow" name="Robots" />
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the Java compiler version for a J2EE project" />
-<meta name="abstract" content="You can change the version of Java used in a J2EE project by changing the value of the Java facet." />
-<meta name="description" content="You can change the version of Java used in a J2EE project by changing the value of the Java facet." />
-<meta content="Java, J2EE project compiler level, projects, Java compiler level" name="DC.subject" />
-<meta content="Java, J2EE project compiler level, projects, Java compiler level" name="keywords" />
+<meta name="DC.Title" content="Changing the Java compiler version for a Java EE project" />
+<meta name="abstract" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
+<meta name="description" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
+<meta content="Java EE, project compiler level, projects, Java compiler level" name="DC.subject" />
+<meta content="Java EE, project compiler level, projects, Java compiler level" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tchangejavalevel" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
 <link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the Java compiler version for a J2EE project</title>
+<title>Changing the Java compiler version for a Java EE project</title>
 </head>
 <body id="tchangejavalevel"><a name="tchangejavalevel"><!-- --></a>
 
 
-<h1 class="id_title">Changing the Java compiler version for a J2EE project</h1>
+<h1 class="id_title">Changing the Java compiler version for a Java EE project</h1>
 
 
 
 <div class="id_taskbody"><p class="id_shortdesc">You can change the version of Java™ used
-in a J2EE project by changing the value of the <span class="uicontrol">Java</span> facet.</p>
+in a Java EE project by changing the value of the <span class="uicontrol">Java</span> facet.</p>
 
 <div class="id_context"><p class="anchor_topictop" />
  <p>The <span class="uicontrol">Java</span> facet
-applies only to J2EE projects. To set the Java compiler level of a non-J2EE project,
+applies only to J2EE projects. To set the Java compiler level of a non-Java EE project,
 such as a Java project, see <a href="../../org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm">Java Compiler</a>.</p>
 <p>To change the Java compiler
 version, complete the following steps:</p>
@@ -61,9 +63,12 @@ Project window and then click <span class="uicontrol">OK</span>.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cfacets.html" title="Facets define characteristics and requirements for J2EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
+<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
new file mode 100644
index 000000000..fb4f6b821
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

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

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

+ "task.dtd">

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

+<title outputclass="id_title">Defining and using annotations</title>

+<shortdesc outputclass="id_shortdesc">You can use the @Interface annotation

+to define your own annotation definition.</shortdesc>

+<prolog><metadata>

+<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm><indexterm>defining</indexterm></indexterm>

+</keywords>

+</metadata></prolog>

+<taskbody outputclass="id_taskbody">

+<context outputclass="id_context"> <p outputclass="anchor_topictop"></p><p><b>Defining

+your own annotations</b></p></context>

+<steps>

+<step><cmd>Use the @Interface annotation to define your own annotation definition:</cmd>

+<info><p><ul>

+<li>Annotation definitions resemble interface definitions</li>

+<li>Annotation method declarations have neither parameters nor <codeph>throws</codeph> clauses,

+and return one of the following elements:<ul>

+<li>primitives</li>

+<li>String</li>

+<li>Class</li>

+<li>enum</li>

+<li>array of the above types</li>

+</ul></li>

+<li>Methods may have default values</li>

+</ul></p><p><codeblock>public @interface CreatedBy{

+     String name();

+     String date();

+     boolean contractor() default false;

+}          </codeblock><codeblock>@CreatedBy(name = "Mary Smith",date="02/02/2008");

+public class MyClass{....}         </codeblock></p></info></step>

+</steps>

+<postreq outputclass="id_postreq"><p><b>Meta-annotations</b>: Meta-annotations

+(annotations of annotations) provide additional information on how an annotation

+should be used:<ul>

+<li>@Target<ul>

+<li>Restricts the use of an annotation</li>

+<li>Single argument must be from Enum ElementType <ul>

+<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>

+</ul></li>

+</ul></li>

+<li>@Retention<ul>

+<li>Indicates where the annotation information will be retained</li>

+<li>Single argument must be from Enum RetentionPolicy<ul>

+<li>{SOURCE, CLASS, RUNTIME}</li>

+</ul></li>

+</ul></li>

+<li>@Documented<ul>

+<li>Marker for annotations that should be included in Javadoc</li>

+</ul></li>

+<li>@Inherited<ul>

+<li>marker for Type annotations that are to be inherited by subtypes</li>

+</ul></li>

+</ul><b>Other built-in annotations</b>: <ul>

+<li>@Overrides<ul>

+<li>Applied to a method</li>

+<li>Indicates that the compiler should generate an error if the method does

+not actually override a superclass method.</li>

+</ul></li>

+<li>@Deprecated<ul>

+<li>Applied to a method</li>

+<li>Indicates that the compiler should generate a warning when the method

+is used externally</li>

+</ul></li>

+<li>@SuppressWarnings<ul>

+<li>Applies to a type or a method</li>

+<li>Indicates that the compiler should supress warnings for that element and

+all subelements<p><codeblock>@Deprecated

+public void oldMethod() {...}

+

+@ SupressWarnings

+public void yesIknowIuseDeprecatedMethods() {...}</codeblock></p></li>

+</ul></li>

+</ul></p><p outputclass="anchor_topicbottom"></p></postreq>

+</taskbody>

+</task>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
new file mode 100644
index 000000000..2aa5ce6be
--- /dev/null
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
@@ -0,0 +1,167 @@
+<?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, 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 content="task" name="DC.Type" />
+<meta name="DC.Title" content="Defining and using annotations" />
+<meta name="abstract" content="You can use the @Interface annotation to define your own annotation definition." />
+<meta name="description" content="You can use the @Interface annotation to define your own annotation definition." />
+<meta content="Java EE 5, annotations, defining" name="DC.subject" />
+<meta content="Java EE 5, annotations, defining" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/ctypesofanno.html" />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tjimpear" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
+<title>Defining and using annotations</title>
+</head>
+<body id="tjimpear"><a name="tjimpear"><!-- --></a>
+
+
+<h1 class="id_title">Defining and using annotations</h1>
+
+
+
+<div class="id_taskbody"><p class="id_shortdesc">You can use the @Interface annotation
+to define your own annotation definition.</p>
+
+<div class="id_context"> <p class="anchor_topictop" />
+<p><strong>Defining
+your own annotations</strong></p>
+</div>
+
+
+<div class="p"><span>Use the @Interface annotation to define your own annotation definition:</span>
+ <div class="p"><ul>
+<li>Annotation definitions resemble interface definitions</li>
+
+<li>Annotation method declarations have neither parameters nor <samp class="codeph">throws</samp> clauses,
+and return one of the following elements:<ul>
+<li>primitives</li>
+
+<li>String</li>
+
+<li>Class</li>
+
+<li>enum</li>
+
+<li>array of the above types</li>
+
+</ul>
+</li>
+
+<li>Methods may have default values</li>
+
+</ul>
+</div>
+<div class="p"><pre>public @interface CreatedBy{
+     String name();
+     String date();
+     boolean contractor() default false;
+}          </pre>
+<pre>@CreatedBy(name = "Mary Smith",date="02/02/2008");
+public class MyClass{....}         </pre>
+</div>
+</div>
+
+
+<div class="id_postreq"><div class="p"><strong>Meta-annotations</strong>: Meta-annotations
+(annotations of annotations) provide additional information on how an annotation
+should be used:<ul>
+<li>@Target<ul>
+<li>Restricts the use of an annotation</li>
+
+<li>Single argument must be from Enum ElementType <ul>
+<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
+
+</ul>
+</li>
+
+</ul>
+</li>
+
+<li>@Retention<ul>
+<li>Indicates where the annotation information will be retained</li>
+
+<li>Single argument must be from Enum RetentionPolicy<ul>
+<li>{SOURCE, CLASS, RUNTIME}</li>
+
+</ul>
+</li>
+
+</ul>
+</li>
+
+<li>@Documented<ul>
+<li>Marker for annotations that should be included in Javadoc</li>
+
+</ul>
+</li>
+
+<li>@Inherited<ul>
+<li>marker for Type annotations that are to be inherited by subtypes</li>
+
+</ul>
+</li>
+
+</ul>
+<strong>Other built-in annotations</strong>: <ul>
+<li>@Overrides<ul>
+<li>Applied to a method</li>
+
+<li>Indicates that the compiler should generate an error if the method does
+not actually override a superclass method.</li>
+
+</ul>
+</li>
+
+<li>@Deprecated<ul>
+<li>Applied to a method</li>
+
+<li>Indicates that the compiler should generate a warning when the method
+is used externally</li>
+
+</ul>
+</li>
+
+<li>@SuppressWarnings<ul>
+<li>Applies to a type or a method</li>
+
+<li>Indicates that the compiler should supress warnings for that element and
+all subelements<div class="p"><pre>@Deprecated
+public void oldMethod() {...}
+
+@ SupressWarnings
+public void yesIknowIuseDeprecatedMethods() {...}</pre>
+</div>
+</li>
+
+</ul>
+</li>
+
+</ul>
+</div>
+<p class="anchor_topicbottom" />
+</div>
+
+</div>
+
+<div>
+<ul class="ullinks">
+<li class="ulchildlink"><strong><a href="../topics/ctypesofanno.html">Types of annotations</a></strong><br />
+Java EE 5 defines a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs).</li>
+</ul>
+
+<div class="familylinks">
+<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cannotations.html" title="The goal of Java EE 5 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 supports the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.">Java EE 5 support for annotations</a></div>
+</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
index 8a01f5399..9639608df 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
@@ -26,9 +26,9 @@ create a J2EE application client project, complete the following steps:</p></con
 trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>

 <uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>

 </step>

-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>

-<uicontrol>Application Client Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>

-</step>

+<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>Java

+EE</uicontrol><uicontrol>Application Client Project</uicontrol></menucascade> and

+click <uicontrol>Next</uicontrol>.</cmd></step>

 <step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for

 the application client project. </cmd></step>

 <step importance="optional"><cmd>To change the default project location, clear

@@ -37,7 +37,7 @@ contents</uicontrol> and select a new location with the <uicontrol>Browse</uicon
 <info>If you specify a non-default project location that is already being

 used by another project, the project creation will fail.<note>If you type

 a new EAR project name, the EAR project will be created in the default location

-with the lowest compatible J2EE version based on the version of the project

+with the lowest compatible Java EE version based on the version of the project

 being created. If you want to specify a different version or a different location

 for the enterprise application, you must use the New Enterprise Application

 Project wizard.</note></info></step>

@@ -50,7 +50,7 @@ the new project will be the same as that of the EAR project.</info></step>
 <step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the

 target runtime for the project.</cmd></step>

 <step importance="optional"><cmd>To use a predefined configuration for your

-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.

+project, select a configuration in the <uicontrol>Configurations</uicontrol> list.

 You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>

 <info><ul>

 <li>Customize project facets. Select the check boxes next to the facets you

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
index fbfc64763..7768801c0 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
@@ -13,7 +13,12 @@
 <meta name="description" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
 <meta content="application client projects, creating" name="DC.subject" />
 <meta content="application client projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjappproj" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -50,9 +55,9 @@ create a J2EE application client project, complete the following steps:</p>
  &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Project</span></span>.</span>
 </li>
 
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- &gt; <span class="uicontrol">Application Client Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
+<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">Java
+EE</span> &gt; <span class="uicontrol">Application Client Project</span></span> and
+click <span class="uicontrol">Next</span>.</span></li>
 
 <li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
 the application client project. </span></li>
@@ -63,7 +68,7 @@ contents</span> and select a new location with the <span class="uicontrol">Brows
  If you specify a non-default project location that is already being
 used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
 a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
+with the lowest compatible Java EE version based on the version of the project
 being created. If you want to specify a different version or a different location
 for the enterprise application, you must use the New Enterprise Application
 Project wizard.</div>
@@ -80,7 +85,7 @@ the new project will be the same as that of the EAR project.</li>
 target runtime for the project.</span></li>
 
 <li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
+project, select a configuration in the <span class="uicontrol">Configurations</span> list.
 You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
  <ul>
 <li>Customize project facets. Select the check boxes next to the facets you
@@ -111,9 +116,15 @@ select the <span class="uicontrol">Create a default Main class</span> check box.
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
+<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
index 77d1b0b26..de2003e51 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
@@ -9,7 +9,7 @@ is imported</title>
 after an EAR is imported.</shortdesc>

 <prolog><metadata>

 <keywords><indexterm>dependencies<indexterm>correcting cyclical</indexterm></indexterm>

-<indexterm>EAR<indexterm>correcting cyclical dependencies</indexterm></indexterm>

+<indexterm>EAR files<indexterm>correcting cyclical dependencies</indexterm></indexterm>

 <indexterm>projects<indexterm>correcting cyclical dependencies</indexterm></indexterm>

 </keywords>

 </metadata></prolog>

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
index 7b55ebde2..ab4d048c2 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
@@ -11,9 +11,10 @@
 <meta name="DC.Title" content="Correcting cyclical dependencies after an EAR is imported" />
 <meta name="abstract" content="You can resolve cyclical dependencies after an EAR is imported." />
 <meta name="description" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta content="dependencies, correcting cyclical, EAR, correcting cyclical dependencies, projects" name="DC.subject" />
-<meta content="dependencies, correcting cyclical, EAR, correcting cyclical dependencies, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="DC.subject" />
+<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjcircleb" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -67,9 +68,11 @@ truly required.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
index 24d716f7b..4780da17c 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
@@ -13,7 +13,12 @@
 <meta name="description" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
 <meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="DC.subject" />
 <meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjear" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -131,9 +136,14 @@ server target as the new enterprise application.</li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
+<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
index 95830203f..acf2bf7c4 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
@@ -13,7 +13,10 @@
 <meta name="description" content="You can export an application client project as a JAR file." />
 <meta content="application client projects, exporting" name="DC.subject" />
 <meta content="application client projects, exporting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjexpapp" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -67,9 +70,13 @@ existing file</span> check box.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
index 9a47da361..bee3bf5ae 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
@@ -13,7 +13,10 @@
 <meta name="description" content="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment." />
 <meta content="EAR, files, exporting, enterprise applications, projects" name="DC.subject" />
 <meta content="EAR, files, exporting, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjexpear" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -78,9 +81,13 @@ save these files prior to export.</div>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
+<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
index 8fce24e25..6cbdb2af5 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
@@ -13,7 +13,10 @@
 <meta name="description" content="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard." />
 <meta content="application client projects, importing" name="DC.subject" />
 <meta content="application client projects, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjimpapp" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -81,9 +84,13 @@ JAR file.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
+<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
index 3ee61d901..e179f2206 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
@@ -13,7 +13,12 @@
 <meta name="description" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
 <meta content="EAR, files, importing, enterprise applications, projects" name="DC.subject" />
 <meta content="EAR, files, importing, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjimpear" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -81,9 +86,15 @@ EAR file.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
+</div>
+<div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
+<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
+<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
index 99375e459..bc3f6bbb0 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
@@ -13,7 +13,8 @@
 <meta name="description" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
 <meta content="connector projects, creating" name="DC.subject" />
 <meta content="connector projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjrar" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -110,9 +111,9 @@ of the folder to use for source code.</span></li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
+<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
index a3f33940c..5573ae640 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
@@ -13,7 +13,8 @@
 <meta name="description" content="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects." />
 <meta content="J2EE, target servers, projects, target servers, J2EE applications" name="DC.subject" />
 <meta content="J2EE, target servers, projects, target servers, J2EE applications" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
+<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjtargetserver" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -114,9 +115,11 @@ shown in bold text.</li>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
+</div>
+<div class="relinfo"><strong>Related information</strong><br />
+<div><a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
index a8b9b54eb..9e4ccd108 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
@@ -13,13 +13,8 @@
 <meta name="description" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
 <meta content="build validation, enabling, code validation, overview, validation" name="DC.subject" />
 <meta content="build validation, enabling, code validation, overview, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
 <meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjval" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -122,24 +117,9 @@ more information.</p>
 
 </div>
 
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rvalerr.html">Common validation errors and solutions</a></strong><br />
-This table lists the common error messages you may encounter when you validate your projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/rvalidators.html">J2EE Validators</a></strong><br />
-This table lists the validators that are available for the different project types and gives a brief description of each validator.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvaldisable.html">Disabling validation</a></strong><br />
-You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalselect.html">Selecting code validators</a></strong><br />
-You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalglobalpref.html">Overriding global validation preferences</a></strong><br />
-For a given project, you can override the global validation preferences.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjvalmanual.html">Manually validating code</a></strong><br />
-When you run a manual validation, all resources in the selected project are validated according to the validation settings.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div><div class="relref"><strong>Related reference</strong><br />
+<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
+<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
index 4200037e4..ee191c448 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
@@ -13,7 +13,9 @@
 <meta name="description" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
 <meta content="validation, disabling, code validation" name="DC.subject" />
 <meta content="validation, disabling, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjvaldisable" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -83,9 +85,10 @@ of your projects, see <a href="tjvalglobalpref.html" title="For a given project,
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
+<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
+<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
index 11cda494e..52fa59c8e 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
@@ -13,7 +13,9 @@
 <meta name="description" content="For a given project, you can override the global validation preferences." />
 <meta content="validation, overriding global preferences, code validation" name="DC.subject" />
 <meta content="validation, overriding global preferences, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjvalglobalpref" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -77,9 +79,10 @@ the button in the <span class="uicontrol">Settings</span> column, then click <sp
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
+<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
+<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
index 6a38a284f..48463a0e6 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
@@ -13,7 +13,9 @@
 <meta name="description" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
 <meta content="validation, manual, code validation" name="DC.subject" />
 <meta content="validation, manual, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjvalmanual" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -71,9 +73,10 @@ Problems view.</div>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
+<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
+<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
index e1fbe630a..6ba8ccdef 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
@@ -13,7 +13,9 @@
 <meta name="description" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
 <meta content="validation, selecting validators, code validation" name="DC.subject" />
 <meta content="validation, selecting validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
+<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="tjvalselect" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -75,9 +77,10 @@ to run on manual validation, build validation, both, or neither.</div>
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
+<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
+<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
 </div>
 </div>
 
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
index 2b0d100c3..c6bcc6b4f 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
@@ -9,7 +9,7 @@ view to hide projects, folders, or files that you do not want to see.</shortdesc
 <prolog><metadata>

 <keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>

 <indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>

-</keywords>

+<indexterm>projects<indexterm>filtering</indexterm></indexterm></keywords>

 </metadata></prolog>

 <taskbody outputclass="id_taskbody">

 <context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To

diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
index f407eb6f1..6288e327f 100644
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
+++ b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
@@ -11,9 +11,9 @@
 <meta name="DC.Title" content="Filtering in the Project Explorer view" />
 <meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
 <meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
+<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="DC.subject" />
+<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="keywords" />
+<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
 <meta content="XHTML" name="DC.Format" />
 <meta content="cjviewfiltersCait" name="DC.Identifier" />
 <meta content="en-us" name="DC.Language" />
@@ -61,9 +61,8 @@ the deployment descriptors are hidden from each project in the view.
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java 2 Platform, Enterprise Edition (J2EE).">J2EE applications</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/cjview.html" title="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.">Project Explorer view in the Java EE perspective</a></div>
 </div>
 </div>