[119107] Updated Web tools docs.
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
index f92953e..dad85c5 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
@@ -105,9 +105,7 @@
<a href="cwwarovr.html" title="">Web archive (WAR) files</a><br />
</p>
<!--<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../../com.ibm.etools.publishing.server.rwd.doc/topics/tstatsrv.html">Publishing static Web projects to a static Web publishing
-
-server</a><br />
+<br />
</p>-->
</div>
</body>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
index 63c5d02..be1c8fa 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
@@ -19,9 +19,9 @@
<body id="ccwebvw"><a name="ccwebvw"><!-- --></a>
<h1 class="topictitle1">Project Explorer view and Web development</h1>
-<div><div class="skipspace"><div class="p">Depending on the product that you have installed, the Project Explorer view may contain the following features: <ul><li>VCM (version control management) information can be toggled on and off
+<div><div class="skipspace"><div class="p">Depending on the product that you have installed, the Project Explorer view may contain the following features: <ul>
-from the Preferences page (<span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Workbench</span> > <span class="uicontrol">Label decorations</span></span>)</li>
+
<li><img src="../images/nwin.gif" alt="For Windows" /> You
can drag and drop files from Windows<sup>®</sup> Explorer or the desktop into the
@@ -50,9 +50,9 @@
<li>Items available from the <span><span class="uicontrol">New</span></span> cascading
menu in the project pop-up menu are context sensitive. All menus will have <span><span class="uicontrol">Project</span></span> and <span><span class="uicontrol">Other</span></span> options.</li>
-<li>All projects are automatically grouped by type. To see this
-view of your projects, click on the <b>Group Project by Type</b> icon <img src="../images/grptype.gif" alt="Group Project by Type Icon" />. </li>
+<li>All projects are automatically grouped by type. </li>
+
</ul>
</div>
</div>
@@ -66,85 +66,7 @@
the project node (based on default folder names).</p>
-<p><b>Web Diagram</b> - A Web
-application diagram, is a file that helps you visualize and change
-
-the flow of a Web application.
-
-This file and associated wizard enables you to construct a diagram of a Web
-
-application by clicking on objects in a palette.</p>
-<p><b>Web Deployment Descriptor</b> -
-
-This file corresponds to the WebContent/WEB-INF/web.xml file, which is used
-
-to specify deployment information for modules created in the Web development
-
-environment. You can edit this file using the <a href="ccwebxml.html">Web
-
-deployment descriptor editor</a>, or you can select <span><span class="uicontrol">Open
-
-With</span></span> from its pop-up menu to open the file with a different
-
-editor. </p>
-<p>Underneath the Deployment Descriptor are placeholders object
-
-that are reserved for the creation of Servlets, Servlet Mappings, Filters,
-
-Filter Mappings, References, Security (constraints and roles) and Listeners.
-
-You can create instances of these objects by right clicking on an object and
-
-selecting <b>New</b> from the pop-up menu.</p>
-<div class="p"><b>JavaSource</b> - This
-
-node displays Java resources within the project. If the project contains
-
-a single Java source folder, the packages and classes (for example,
-
-servlets, beans) within the source folder will be shown directly beneath the
-
-JavaSource folder node. If the project contains multiple source folders, each
-
-source folder will appear beneath the JavaSource folder and can be expanded
-
-to show their packages and classes. <div class="note"><span class="notetitle">Note: </span>Though the default name given
-
-to the folder is JavaSource, you can change the name in the Preferences page
-
-by selecting <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Web Tools</span> > <span class="uicontrol">New J2EE Project</span></span>.</div>
-<ul><li><b>Libraries</b> - This folder contains the library JAR files defined
-
-in the project properties. Three types of JAR files are shown: <ol><li>JAR files included in the project's WebContent/WEB-INF/lib directory</li>
-<li>JAR files external to the project, such as j2ee.jar and rt.jar</li>
-<li>Project libraries, which are special references to a Java project</li>
-</ol>
-<p>When a Web project is exported, a JAR file is automatically created
-
-from the Java project to be used by the Web application during
-
-runtime. Libraries are shown in classpath order. By default, only the JAR
-
-files contained within the project are shown. You can also display external
-
-JARs and project libraries by selecting <span><span class="uicontrol">Show Referenced Libraries</span></span> from
-
-the Navigator view's <span><span class="uicontrol">Menu</span></span> button <img src="../images/menubutton.gif" alt="Menu button" />.</p>
-</li>
-<li><b>imported_classes folder</b> - This folder can be created during a WAR
-
-import, and contains class files that do not have accompanying source. The <span class="uicontrol">imported_classes</span> folder
-
-is a Java classes
-
-folder; Java classes folders can also be created using the
-
-Web project <span><span class="uicontrol">Java Build Path</span></span> properties page.<p><img src="../images/nwin.gif" alt="For Windows" /> You can drag
-
-and drop class files from the Windows Explorer or desktop to the <span class="uicontrol">imported_classes</span> folder
-
-in the Navigator view.</p>
</li>
</ul>
</div>
@@ -171,10 +93,7 @@
JAR files.</li>
</ul>
-<ul><li><b>Theme</b> - The suggested directory for cascading style sheets and
-
-other style-related objects.</li>
-<li><b>WEB-INF</b> - The directory where supporting Web resources for a Web
+<ul><li><b>WEB-INF</b> - The directory where supporting Web resources for a Web
application are kept (for example: .xmi files, .xml files, and web.xml.) Note
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
index 9ff0863..9e345d3 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
@@ -30,50 +30,52 @@
version that reduces project overhead when dynamic elements are not required.
Static Web projects can later be converted to dynamic Web projects.</li>
-<li>Creation and editing of a Web application deployment descriptor (<span class="filepath">web.xml</span>)
- file</li>
+<!-- <li>Creation and editing of a Web application deployment descriptor (<span class="filepath">web.xml</span>) file</li> -->
+
<li>JSP and HTML file creation, validation, editing, and debugging</li>
<li>JavaScript™ editing and validation</li>
-<li>Custom JSP tags (tag library) support, based on the <cite>Sun Microsystems
+
+<!-- <li>Custom JSP tags (tag library) support, based on the <cite>Sun Microsystems -->
JSP 1.2 Specification</cite></li>
<li>An extensible view, called the Snippets view, which allows users to catalog
-
and organize reusable programming objects, such as HTML, JavaScript,
-
and JSP markup, along with files and custom tags, that can be embedded in
-
existing files</li>
-<li>Dynamic tag help (content assist) , which displays tag usage and attribute
+<li>Dynamic tag help called content assist (Ctrl+Spacebar) that displays tag usage and attribute
information for HTML, JSP, and JavaScript tags based on cursor location
+ in the Source page. </li>
- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)
+<!-- <li>Quick Edit view that allows you to edit specific pieces of code in context,
+ including add actions and events</li> -->
-)</li>
-<li>Quick Edit view that allows you to edit specific pieces of code in context,
-
- including add actions and events</li>
<li>Palette view to reuse components, including HTML, JSP, JavaScript,
-
site parts, and more</li>
-<li>Attributes editing available in its own view</li>
+
+<!-- <li>Attributes editing available in its own view</li> -->
+
<li>Cascading style sheet (CSS) editing support</li>
+
<li>HTTP/FTP import</li>
+
<li>FTP export (simple resource copy) to a server</li>
-<li>WAR file import, export, and validation (Now includes even more file types).</li>
-<li>Link parsing, validation, and management, which includes converting links,
- flagging broken links, and fixing up links as linked resources are moved
+<li>WAR file import, export, and validation.</li>
-or renamed</li>
-<li>Servlet creation, which employs the Servlet Wizard to create new servlets
+<!-- <li>Link parsing, validation, and management, which includes converting links,
+ flagging broken links, and fixing up links as linked resources are moved or renamed</li> -->
- and add servlet mappings to the Web deployment descriptor files</li>
-<li>Integration with the WebSphere<sup>®</sup> test environment</li>
-<li>Publishing support for multiple Web server types</li>
-<li>Wizards for Listener and Filter classes</li>
+<li>Servlet creation via a the Servlet Wizard to create new servlets </li>
+<!-- and add servlet mappings to the Web deployment descriptor files -->
+
+<!-- <li>Integration with the WebSphere<sup>®</sup> test environment</li> -->
+
+<!-- <li>Publishing support for multiple Web server types</li> -->
+
+<!-- <li>Wizards for Listener and Filter classes</li> -->
+
</ul>
</div>
</div>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
index cc930c6..2aedd35 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
@@ -16,113 +16,46 @@
<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
<title>Creating JavaServer Pages (JSP) files</title>
</head>
-<body id="tjcrejsp"><a name="tjcrejsp"><!-- --></a>
+<body id="tjcrejsp"><a name="tjcrejsp"></a>
<h1 class="topictitle1">Creating JavaServer Pages (JSP) files</h1>
-<div><div class="skipspace"> <p>You can create and edit a JSP file,
-HTML file, or JSP tagging. This includes placing Java™ source code inside of scriptlet tags.
-</p>
- <div class="p">Most types of JSP files can be
+<div><div class="skipspace">
+ <p>Most types of JSP files can be
created using the New JSP File wizard.
- </div>
-To create a basic JSP file using the JSP file wizard, complete the
+ </p>
+ To create a basic JSP file using the JSP file wizard, complete the
following steps: </div>
-<ol><li class="skipspace"><span>Create a dynamic Web project if you have not already done so.</span></li>
-<li class="skipspace"><span>Open the <b>Web</b> perspective.</span></li>
-<li class="skipspace"><span>Select the Web project, and then select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">JSP File</span></span>.</span> The New JSP File window appears.</li>
-<li class="skipspace"><span>Select the <b>Browse</b> button and select an appropriate container
-for the file from the list of project folders (and subfolders). </span> <p>The
-folder that you choose should be under the Web content folder of a dynamic
-Web project. If a JSP file is <i>not</i> under this folder, then it will not
+ <ol>
+ <li class="skipspace"><span>Create a dynamic Web project if you have not already done so.</span></li>
+ <li class="skipspace"><span>In the Project Explorer, expand your project and right click on your <b>WebContent </b>folder or on a subfolder under WebContent.<br>
+ <br>
+ Note that if you choose any other folder in which to create the JSP, then it will not
be included in the WAR file that is deployed to the server. In addition, link
-validation will not encompass files that are not under the Web content folder.</p>
-</li>
-<li class="skipspace"><span>Type a file name into the appropriate field.</span></li>
-<li class="skipspace"><span>Ensure that the appropriate option is displayed in the <span class="uicontrol">Markup
-language</span> drop-down list. </span> Note that the option you
-choose will determine the model of JSP that appears in the <b>Model</b> pull-down
-list.<p>In addition, if you select the <span class="uicontrol">Create as JSP fragment</span> check
-box, this file will be created as a fragment that can be added to another
-JSP file. Other JSP files can include JSP fragments using a JSP include directive.
-Creating a fragment causes the resulting file to end in a .jspf or .jsf extension.
-You will not be prompted for DOCTYPE information, because a fragment cannot
-stand alone as a Web page, and it would invalidate any JSP file that included
-it.</p>
- <p>Also, depending on the markup language you select, you can select
-the <span class="uicontrol">Use XML style syntax</span> option to create a JSP file
-that adheres to XML style tagging.</p>
-</li>
-<li class="skipspace"><span> You have several options for proceeding: (Note that the windows
-that appear in this wizard are determined by the options that you select) </span><ul><li>To accept the defaults associated with a new JSP file, select <span class="uicontrol">None</span> in
-the <span class="uicontrol">Model</span> drop-down list, and then select <span class="uicontrol">Finish</span>. </li>
-<li> To use one of the sample templates provided, select <span class="uicontrol">Create
-from page template</span>, and then select <b>Next</b>. (Note that this
-is only available for HTML and XHTML markup languages.) If you choose this
-option, a window appears in which you can choose a sample template or a user-defined
-template.</li>
-<li>If you want to specify or customize the file options, select the <span class="uicontrol">Configure
-advanced options</span> check box and click <span class="uicontrol">Next</span>.</li>
-</ul>
-</li>
-<li class="skipspace"><span> Click the <span class="uicontrol">Add</span> button to locate a Tag Library
-Descriptor (TLD) file or a JAR file that contains a TLD file to add tag libraries
-from a variety of sources.</span> <p>Tag library Universal Resource Identifier
-(URIs) can be located in one of the following places:</p>
-<ul><li>Defined in the web.xml file</li>
-<li>Within a JAR file located in the project lib directory that contains /META-INF/taglib.tld</li>
-<li>Within a JAR file external to the project</li>
-<li>In a "loose" TLD anywhere in the project</li>
-</ul>
-<ol type="a"><li class="skipspace"><span>In the <span class="uicontrol">Select a tag library</span> dialog, either
-select one of the available tag libraries, or click the <span class="uicontrol">Import</span> button
-to locate and add a tag library to the list, and then select it.</span> The
-dialog will automatically populate the informational fields that describe
-the tag library and its contents. You must specify a <span class="uicontrol">Prefix</span> value.</li>
-<li class="skipspace"><span>Click <span class="uicontrol">OK</span> to add the tag library.</span> Note that if the selected TLD files hasn't been registered in
-the web.xml file, it will be added automatically.</li>
-</ol>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>If you want to select an encoding type, deselect the <span class="uicontrol">Use
-workbench encoding</span> check box to select a new encoding attribute.
-Select the appropriate encoding value to add to the file's HTML declaration
-from the <span class="uicontrol">Encoding</span> drop-down list.</span> The default
-is the value set in the <span class="uicontrol">HTML Files</span> preferences page,
-which is accessed by selecting <span class="uicontrol">Window > Preferences</span>,
-and then expanding the <span class="uicontrol">Web and XML Files</span> preferences.</li>
-<li class="skipspace"><span>Ensure that the proper content type is selected in the <span class="uicontrol">Content
-Type</span> drop-down list. The default depends on the markup language.</span></li>
-<li class="skipspace"><span>Select the <span class="uicontrol">Document Type</span> that you wish to
-associate with the JSP file. The default depends on the markup language.</span></li>
-<li class="skipspace"><span>Specify a cascading style sheet (CSS) file to be referenced by
-the new JSP file. Typically, CSS files are located in the theme folder under
-the Web content folder. You can use <b>Add</b> to choose a style sheet from
-the file system. Use <b>Remove</b> to delete a style sheet from the list,
-or use the arrow buttons to rearrange the order in which the file references
-the style sheets. If a style sheet is already associated with the project
-in which you are creating the new file, that style sheet is the default.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span> to select specific method stubs
-and add deployment information to the Web project's web.xml file. </span> <p>Select
-any appropriate method stubs to be created in the servlet that is deployed
-for this JSP file.</p>
-<p>If you select the <span class="uicontrol">Add to web.xml</span> check
-box, the JSP file, along with its display name, and any URL mappings and initialization
-parameters associated with the JSP file will be automatically included in
-the Web project deployment descriptor file. Note that the <span class="uicontrol">File
-Name</span> value provided in the first page of the wizard is automatically
-mapped to the <span class="uicontrol">Servlet Name</span> value on this page, as well
-the <span class="uicontrol">URL Pattern</span> mappings. These mappings are not updated
-if you change the original value in the <span class="uicontrol">File Name</span> field.</p>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span> to create the file in the project
-that you have selected.</span></li>
-</ol>
+validation will not encompass files that are not under the WebContent folder.</span><br>
+ <br>
+ </li>
+ <li><span>From the context menu, select<span class="menucascade"><b> <span class="uicontrol">New</span> > <span class="uicontrol">JSP</span></b></span>.</span> The New JavaServer Page window appears with your folder selected.<br>
+ <br>
+ </li>
+ <li class="skipspace"><span>Type a file name into the File name field, making sure you include the jsp extension (jsp, jsv, jtpl, or jspx) in the file name.<br>
+ <br>
+ </span></li>
+ <li class="skipspace"><span> You have several options for proceeding: </span>
+ <ul>
+ <li>To accept the defaults associated with a new JSP file, select <span class="uicontrol"><b>Finish</b></span>. </li>
+ <li>To link to a file in the file system and specify path variables, select <b>Advanced</b> and then make your selections using the <b>Browse</b> and <b>Variables</b> buttons.</li>
+ <li> To use a template file for the initial content of your JSP page, select <b>Next</b>. The Select JSP Template window appears. Select the <b>Use JSP Template</b> check box, and then select one of the sample templates. You can also select the <b>JSP Templates</b> link to add or remove JSP templates to your list of templates.</li>
+ </ul>
+ </li>
+ </ol>
</div>
<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/cpdjsps.html">JavaServer Pages (JSP) technology </a><br />
+<a href="../../org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html">JavaServer Pages (JSP) technology </a><br />
</p>
<p><b class="reltaskshd">Related tasks</b><br />
<a href="twcreprj.html" title="">Creating a dynamic Web project</a><br />
+ <a href="../../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html">Adding and removing JSP templates</a><br />
+ <a href="../../org.eclipse.platform.doc.user/tasks/tasks-45.htm">Creating linked resources</a><br />
</p>
</div>
</body>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
index 082b58a..fc4600d 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
@@ -19,145 +19,53 @@
<body id="twcreprj"><a name="twcreprj"><!-- --></a>
<h1 class="topictitle1">Creating a dynamic Web project</h1>
-<div><div class="skipspace"> <p>You create and maintain the resources for your Web applications
+ <p>You create and maintain the resources for your Web applications
in Web projects. Unlike with <a href="twcresta.html">static</a> Web projects, dynamic Web projects
enable you to create resources such as JavaServer Pages and servlets.</p>
<p>To create a new dynamic Web project, complete the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open the J2EE perspective and select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Dynamic Web Project</span></span>.</span> The <span class="uicontrol">New Dynamic Web Project</span> wizard starts.</li>
-<li class="skipspace"><span>Type a name for your Web project.</span> <p></p>
-</li>
-<li class="skipspace"><span>Accept the default value in the <span class="uicontrol">Project location</span> field
-(this is where your project is stored in your file system), or click <span class="uicontrol">Browse</span> to
+ <ol>
+ <li>Open the J2EE perspective</li>
+ <li>In the Project Explorer, right click on Dynamic Web Projects and select <b>New</b><b>> Dynamic Web Project</b> from the context menu. </span> The New Dynamic Web Project</span> wizard starts.</li>
+ <li>Follow the project wizard prompts<br> <br> </li>
+ </ol>
+ <p>
+<b>Helpful field information and general terminology</b>
+<br>
+ <br>
+ </p>
-choose a location from the file system. Then click the <b>Show Advanced</b> button
+<p><b>Project Facets</b></p>
+<p>A facet represents a unit of functionality in a WTP project. For example, the Dynamic Web Module facet enables the project to be deployed as a dynamic web module. A brief description of a project facets appears in the wizard when you select it.<br>
+<br>
+Note that in many instances, you can view the constraints for a project facet by right clicking on the facet and selecting project constraints from the pop up menu.
+</p>
-if the advanced options are not already displayed.</span> <p></p>
-</li>
-<li class="skipspace"><span>Select the servlet version number.</span> The servlet version
+<p><b>Target Runtime</b></p>
+<p>Use this field to define a new installed runtime environment. Runtimes are used at build time to compile projects.
+</p>
-determines the server level on which you can run your applications. Any new servlets and JSP files that you expect to create
-
-should adhere to the latest servlet specification level available. (Previous
-
-specification levels are offered to accommodate any legacy dynamic elements
-
-that you expect to import into the project). <div class="p"><b>Notes:</b> <ul><li>The servlet version determines the choice of target servers that appear
-
-in the drop-down list.</li>
-<li>The following servlet versions correspond to the following J2EE levels:
-
- <ul><li>version 2.2 - J2EE 1.2</li>
-<li>version 2.3 - J2EE 1.3</li>
-<li>version 2.4 - J2EE 1.4</li>
-</ul>
- </li>
-<li>Note that you can upgrade your servlet version using the <a href="../../org.eclipse.jst.j2eeapp.doc.user/topics/tjmigrate.html">J2EE Migration Wizard</a> but you can't go revert to an earlier
-
-level.</li>
-</ul>
-</div>
-</li>
-<li class="skipspace"><span>Select a target server from the drop-down list or create a new
-
-target server by selecting the <span class="uicontrol">New</span> button</span></li>
-<li class="skipspace"><span>A new or existing Enterprise Application project (EAR Project)
-
+<p><b>Enterprise Application project (EAR Project)</b></p>
+<p>A new or existing Enterprise Application project (EAR Project)
must be associated with your new Web project to facilitate deployment. If
-
you want to override the default settings for the Enterprise Application project,
+you can do so using the wizard. When your Web project is created at the end of the wizard, the new Enterprise Application project is also created with the name specified in the EAR project field. Note that the default is the name of the web project appended with EAR (unless the ear
+project was selected when you opened the wizard.)</p>
-click <span class="uicontrol">New</span>, and make your changes. When your Web project
-
-is created at the end of the wizard, the new Enterprise Application project
-
-is also created with the name specified in the EAR project field. Note that
-
-the default is the name of the web project appended with EAR (unless the ear
-
-project was selected when you opened the wizard.) If you want to use an existing
-
-Enterprise Application project, select the project from the <span class="uicontrol">EAR
-
-project</span> drop down list.</span> <p> If you want to add a Web
-
-project as a module to another Enterprise Application project in the future,
-
-you can open the <a href="../../org.eclipse.jst.j2eeapp.doc.user/topics/cjapped.html">application deployment descriptor editor</a> for the Enterprise
-
-Application project and select the <span><span class="uicontrol">Add</span></span> option
-
-in the <span><span class="uicontrol">Module</span></span> page.</p>
-</li>
-<li class="skipspace"><span> Specify a context root. (The context root is the Web application
-
-root, which is the top-level directory of your application when it is deployed
-
-to the Web server). You can change the context root after you create a project
-
-using the project <span><span class="uicontrol">Properties</span></span> dialog, which
-
-you access from the project's pop-up menu. The context root can also be used
-
-by the links builder to ensure that your links remain ready to publish as
-
-you move and rename files inside your project.</span></li>
-<li class="skipspace"><span>To add support for annotated Java classes, select the appropriate
-
-check box.</span></li>
-<li class="skipspace"><span> To specify or customize the project options, select the <span class="uicontrol">Next</span> check
-
-box .</span></li>
-<li class="skipspace"><span>Select one or more of the <span><span class="uicontrol">Web Project features</span></span>.
-
-The box on the right displays a description of each feature as you select
-
-it on the left. </span> The default features are, <b>Default style sheet</b> (CSS
-
-file) and <a href="../../org.eclipse.wst.web.diagram.doc.user/topics/twebdia020.html"> web diagram</a>. Accepting the default style sheet creates
-
-a default CSS file called Master.css, which is used for any HTML and JSP files
-
-included in the project.<ul>
-</ul>
-</li>
-<li class="skipspace"><span>Click <span class="uicontrol">Next</span>.</span></li>
-<li class="skipspace"><span>Select <span class="uicontrol">Use a default Page Template for the Web Site</span> if
-
-you want your entire Web site to share a common page template. If you want
-
-to use one of the sample templates provided, select <span class="uicontrol">Sample Template</span> and
-
-then choose one of the templates shown in the <span class="uicontrol">Thumbnail</span> box.
-
-If you want to use a template of your own, select <span class="uicontrol">User-defined
-
-Template</span> and then click <span class="uicontrol">Browse</span> to select
-
-the template from the file system. The selected template is copied into your project for use when creating web pages. </span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>. The wizard creates a new project that reflects the
-
-J2EE folder structure that specifies the location of web content files, class
-
-files, class paths, the deployment descriptor, and supporting metadata. </span></li>
-</ol>
-<div class="skipspace"><p>You can now begin creating or importing content for your Web project
-
-using Web resource editors, the New File wizards, or the Import wizards available from
-
-the <span class="uicontrol">File</span> menu.</p>
-</div>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccwebprj.html">Dynamic Web projects and applications</a><br />
-<a href="ccstatic.html">Static Web projects</a><br />
+<p><b>Context Root</b>
</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tjcrehtm.html" title="">Creating HTML or XHTML files</a><br />
-<a href="tjcrejsp.html" title="">Creating JSP files</a><br />
+<p>The context root is the Web application root, which is the top-level directory of your application when it is deployed to the Web server. You can change the context root after you create a project using the project Properties dialog, which you access from the project's pop-up menu. The context root can also be used by the links builder to ensure that your links remain ready to publish as you move and rename files inside your project.
</p>
-</div>
-</body>
+<!-- <p><b>Servlet Version</b>
+</p>
+ <li>The following servlet versions correspond to the following J2EE levels:
+
+ <ul>
+ <li>version 2.2 - J2EE 1.2</li>
+ <li>version 2.3 - J2EE 1.3</li>
+ <li>version 2.4 - J2EE 1.4</li>
+ </ul> -->
+
+
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
index 4888915..9e4b989 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
@@ -25,71 +25,38 @@
that contains no dynamic elements, such as JSP files or servlets, use the <span><span class="uicontrol">New
-Static Web Project</span></span> wizard. If you later decide that you want
+Static Web Project</span></span> wizard.
+<!--If you later decide that you want
+to add dynamic elements to this project, you can <a href="twpcnvrt.html">convert the project to a dynamic Web project</a>.</p> -->
-to add dynamic elements to this project, you can <a href="twpcnvrt.html">convert the project to a dynamic Web project</a>.</p>
-<p> Note
-that static web projects will not run in the provided WebSphere<sup>®</sup> test environments,
+<p>To create a new static Web project, complete the following steps:</p>
-but these projects can be previewed in a browser directly from the workspace.
+ <ol>
+ <li>Open the J2EE perspective</li>
+ <li>In the Project Explorer, right click on Other Projects and select <b>New</b><b>> Other>Web>Static Web Project</b> from the context menu. </span> The New Static Web Project</span> wizard starts.</li>
+ <li>Follow the project wizard prompts<br> <br> </li>
+ </ol>
+ <p>
+<b>Helpful field information and general terminology</b>
+<br>
+ <br>
+ </p>
- </p>
-<p>To create a new static Web project, open the J2EE perspective and complete
-
-the following steps:</p>
-</div>
-<ol><li class="skipspace"><span>Select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span> > <span class="uicontrol">Static Web Project</span></span>. </span> <p>The <span class="uicontrol">New
-
-Static Web Project</span> wizard appears.</p>
-</li>
-<li class="skipspace"><span>Provide a name for the Web project.</span> <p></p>
-</li>
-<li class="skipspace"><span>Accept the default value in the <span class="uicontrol">Project location</span> field
-
-(this is where your project is stored in your file system), or click <span class="uicontrol">Browse</span> to
-
-choose a location from the file system.</span>
-</li>
-<li class="skipspace"><span>You have two options to proceed: </span> <ul><li>If you want to accept the defaults associated with a static Web project,
-select <span class="uicontrol">Finish</span> .</li>
-<li>If you want to specify or customize the project options, select <span class="uicontrol">Next</span>.
-The following step assumes you have chosen this option.</li>
-</ul>
- </li>
-<li class="skipspace"><span>Select one or more of the <span class="uicontrol">Web Project features</span>. </span> <p>The default selects the <span class="uicontrol">Default style sheet (CSS)</span> check
-box, which creates a default CSS file (called Master.css) for the project.</p>
-</li>
-<li class="skipspace"><span>Select <b>Next</b>, and then select <span class="uicontrol">Use a default Page
-
-Template for the Web Site</span> if you want your entire Web site to
-
-share a common page template.</span> <p>If you want to use one of the
-
-sample templates provided, select <b>Sample Page Template</b> and then choose
-
-one of the templates shown in the <b>Thumbnail</b> box. If you want to use
-
-a template of your own, select <b>User-defined Page Template</b> and then
-
-click <b>Browse</b> to select the template from the file system. </p>
-</li>
-<li class="skipspace"><span>Click <b>Finish</b>. The wizard creates an empty project containing
-
-the appropriate folder structure, which you can see in the Project Explorer.</span></li>
-</ol>
-<div class="skipspace"><p>You can now begin creating or importing content for your Web project
-
-using Web resource editors, the
-
-New File wizards, or the Import wizards available from the <span class="uicontrol">File</span> menu.</p>
-</div>
-<div><p><b class="relconceptshd">Related concepts</b><br />
-<a href="ccstatic.html">Static Web Projects</a><br />
+<p><b>Project Facets</b></p>
+<p>A facet represents a unit of functionality in a WTP project. For example, the Static Web Module facet enables the project to be deployed as a static web module. A brief description of a project facets appears in the wizard when you select it.<br>
+<br>
+Note that in many instances, you can view the constraints for a project facet by right clicking on the facet and selecting project constraints from the pop up menu.
</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../../org.eclipse.wst.publishing.server.ui.doc.user/topics/tstatsrv.html">Publishing static Web projects to a static Web publishing
-server</a><br />
+
+
+
+<p><b>Target Runtime</b></p>
+<p>Use this field to define a new installed runtime environment. Runtimes are used at build time to compile projects.
</p>
-</div>
+
+<p><b>Web Content Folder</b>
+</p>
+<p>
+The folder in which you want to store your publishable resources.
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
index 74dff4f..34ec600 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
@@ -30,53 +30,36 @@
following steps: </p>
</div>
-<ol><li class="skipspace"><span>From the J2EE perspective, expand your <a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/ccwebprj.html">dynamic project</a> in the Project Explorer view.</span></li>
-<li class="skipspace"><span>Right click on the <b>Servlet</b> icon, and select <span class="menucascade"><span class="uicontrol">New</span> > <span class="uicontrol">Servlet</span></span> from
+ <ol>
+ <li class="skipspace"><span>From the J2EE perspective, expand your <a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/ccwebprj.html">dynamic project</a> in the Project Explorer view.</span></li>
+ <li class="skipspace"><span>Right click on the <b>Servlet</b> icon, and select <span class="menucascade"><span class="uicontrol">New</span> > <span class="uicontrol">Servlet</span></span> from
the pop-up menu.</span> The <span class="uicontrol">Create Servlet</span> wizard
appears.</li>
-<li class="skipspace"><span>In the <span class="uicontrol">Create a Servlet</span> page, supply the
+ <li class="skipspace"><span>In the <span class="uicontrol">Create a Servlet</span> page, supply the
-following: </span><ol type="a"><li class="skipspace"><span>Type the name and description of the servlet.</span> Notice
+following: </span>
+ <ol type="a">
+ <li class="skipspace"><span>Type the name and description of the servlet.</span> Notice
that the name that you type in the name field is used as the default URL mapping.</li>
-<li class="skipspace"><span>Optionally add or remove initialization parameters and URL mappings.</span></li>
-<li class="skipspace"><span>Optionally choose an existing servlet class. To do this, select
+ <li class="skipspace"><span>Optionally add or remove initialization parameters and URL mappings.</span></li>
+ <li class="skipspace"><span>Either click <b>Finish</b>
-the <b>Use existing servlet class</b> check box, and then select the <b>Browse</b> button. A window
+ or select <b>Next</b> for more options<b>. </b></span></li>
+ </ol>
+ </li>
+ <li class="skipspace"><span>Select a modifier to specify whether your servlet class is public,
-appears in which you can choose an existing servlet or a JSP.</span></li>
-<li class="skipspace"><span>Optionally choose whether you want to generate an annotated
-
-servlet class.</span></li>
-<li class="skipspace"><span>If you selected an existing servlet class, click <b>Finish</b>;
-
-otherwise, select <b>Next.</b></span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Supply the following information:</span><ol type="a"><li class="skipspace"><span>Specify the folder where the servlet class will be placed, the
-
-package that the class will belong to (it is added into a default package
-
-if you do not specify one), and the class name of the servlet. </span></li>
-<li class="skipspace"><span>Specify a superclass for the servlet class.</span> A servlet
-
-created by this wizard can have HttpServlet, or any class that has HttpServlet
-
-in its hierarchy as its superclass. Click <b>Browse</b> to choose from the
-
-available superclasses.</li>
-<li class="skipspace"><span>Click <b>Finish</b> or click <b>Next</b> for more options.</span></li>
-</ol>
-</li>
-<li class="skipspace"><span>Select a modifier to specify whether your servlet class is public,
-
-abstract, or final.</span> (Classes cannot be both abstract and final.)<ol type="a"><li class="skipspace"><span> The javax.servlet.Servlet is provided as the default <span class="uicontrol">Interface</span>.
+abstract, or final.</span> (Classes cannot be both abstract and final.)
+ <ol type="a">
+ <li class="skipspace"><span> The javax.servlet.Servlet is provided as the default <span class="uicontrol">Interface</span>.
You can also add additional interfaces to implement. Click <span class="uicontrol">Add</span> to
-open the <span><span class="uicontrol">Interface Selection</span></span> dialog.</span> <p>In this dialog, as you type the name of the interface that you are
+open the <span><span class="uicontrol">Interface Selection</span></span> dialog.</span>
+ <p>In this dialog, as you type the name of the interface that you are
interested in adding in the <span><span class="uicontrol">Choose interfaces</span></span> field,
@@ -89,28 +72,25 @@
click <span class="uicontrol">Add</span>. Click <span class="uicontrol">OK</span> when you
are finished.</p>
-</li>
-<li class="skipspace"><span>Select any appropriate method stubs to be created in the servlet
+ </li>
+ <li class="skipspace"><span>Select any appropriate method stubs to be created in the servlet
file. The stubs created by using the <span class="uicontrol">Inherited abstract methods</span> option
must be implemented if you do not intend to create an abstract servlet. This
is not true for <span class="uicontrol">Constructors from superclass</span>.</span></li>
-<li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> The servlet
+ <li class="skipspace"><span>Click <span class="uicontrol"><b>Finish</b></span>.</span> The servlet
is generated.</li>
-</ol>
-</li>
-</ol>
+ </ol>
+ </li>
+ </ol>
</div>
<div><p><b class="relconceptshd">Related concepts</b><br />
<a href="../../org.eclipse.wst.webtoolscore.doc.user/topics/cwservbn.html">Servlets</a><br />
-<!-- <a href="../../com.ibm.etools.wrd.annotation.doc/topics/coverview.html">Annotation-based programming overview</a><br />-->
</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<!-- <a href="../../com.ibm.etools.wrd.annotation.doc/topics/tadding_web_tag.html">Adding Web annotation tags</a><br />-->
-</p>
+ <p> </p>
</div>
</body>
</html>
\ No newline at end of file
