updated for M4
diff --git a/development/milestone_plans/reports/report-milestone-overview.html b/development/milestone_plans/reports/report-milestone-overview.html
index e1cf15b..7e04043 100644
--- a/development/milestone_plans/reports/report-milestone-overview.html
+++ b/development/milestone_plans/reports/report-milestone-overview.html
@@ -99,7 +99,7 @@
 <b>M6-Endgame</b>
 </a>
 										-
-										<statusDescription>uly 29, 2005</statusDescription>
+										<statusDescription>July 29, 2005</statusDescription>
 <br>
 <contentDescription>Stabilization, final bug fixes. Based on Eclipse 3.1 Release</contentDescription>
 </br>
@@ -331,8 +331,8 @@
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
-						Document Designs, API, and JUnit tests
-					</description>
+                                                Document Designs, API, and JUnit tests
+                                        </description>
 </td>
 </tr>
 <tr>
@@ -865,9 +865,9 @@
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
-						continue refactoring to improve separation of
-						components
-					</description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
 </td>
 </tr>
 <tr>
@@ -876,8 +876,8 @@
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
-						CSS Validation
-					</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+                                                CSS Validation
+                                        </description>
 </td>
 </tr>
 <tr>
@@ -1641,8 +1641,8 @@
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
-						Finish Document Designs, API, and JUnit tests
-					</description>
+                                                Finish Document Designs, API, and JUnit tests
+                                        </description>
 </td>
 </tr>
 <tr>
@@ -2215,9 +2215,9 @@
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
-						Finish refactoring to improve separation of
-						components
-					</description>
+                                                Finish refactoring to improve separation of
+                                                components
+                                        </description>
 </td>
 </tr>
 <tr>
diff --git a/development/milestone_plans/reports/report-milestone-overview.xml b/development/milestone_plans/reports/report-milestone-overview.xml
index ec4e875..ae09218 100644
--- a/development/milestone_plans/reports/report-milestone-overview.xml
+++ b/development/milestone_plans/reports/report-milestone-overview.xml
@@ -17,7 +17,7 @@
 			<contentDescription>WTP 1.0 API Implementation Complete. Based on Eclipse 3.1 M7</contentDescription>
 		</milestone>
 		<milestone name="M6-Endgame">
-			<statusDescription>uly 29, 2005</statusDescription>
+			<statusDescription>July 29, 2005</statusDescription>
 			<contentDescription>Stabilization, final bug fixes. Based on Eclipse 3.1 Release</contentDescription>
 		</milestone>
 	</milestoneSummary>
diff --git a/jst/components.html b/jst/components.html
index a8f1ed0..63337ef 100644
--- a/jst/components.html
+++ b/jst/components.html
@@ -24,48 +24,48 @@
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			This document describes the component structure for the J2EE
-			Standard Tools subproject. As the name of this subproject
-			implies, our scope includes J2EE standards, such as JSP,
-			servlet, EJB and related standards which are defined by the
-			JCP. This is in contrast to the Web Standard Tools
-			subproject whose scope is Web and related standards defined
-			by organizations such as W3C, OASIS, and ANSI. One of the
-			main organizing principles of this subproject is to group
-			all work related to a given standard within a single
-			component. For example, there are components for JSP editing
-			and J2EE projects. The other main organizing principle is to
-			create a component for each major framework. For example,
-			there are components for Server tools and the Web service
-			wizard. Finally, there are components for related sets of
-			code that do not fall into either of the two main
-			categorizations. For example, there is a common component
-			for utilities and other shared infrastructure code.
-		</p>
+                        This document describes the component structure for the J2EE
+                        Standard Tools subproject. As the name of this subproject
+                        implies, our scope includes J2EE standards, such as JSP,
+                        servlet, EJB and related standards which are defined by the
+                        JCP. This is in contrast to the Web Standard Tools
+                        subproject whose scope is Web and related standards defined
+                        by organizations such as W3C, OASIS, and ANSI. One of the
+                        main organizing principles of this subproject is to group
+                        all work related to a given standard within a single
+                        component. For example, there are components for JSP editing
+                        and J2EE projects. The other main organizing principle is to
+                        create a component for each major framework. For example,
+                        there are components for Server tools and the Web service
+                        wizard. Finally, there are components for related sets of
+                        code that do not fall into either of the two main
+                        categorizations. For example, there is a common component
+                        for utilities and other shared infrastructure code.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a href="http://dev.eclipse.org/viewcvs/index.cgi/jst/components/?cvsroot=WebTools_Project">
-				CVS Repository
-			</a>
-		</td>
+                        <a href="http://dev.eclipse.org/viewcvs/index.cgi/jst/components/?cvsroot=WebTools_Project">
+                                CVS Repository
+                        </a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			All JST components are stored in the Eclipse CVS repository
-			at dev.eclipse.org in the path
-			/home/webtools/jst/components.
-		</p>
+                        All JST components are stored in the Eclipse CVS repository
+                        at dev.eclipse.org in the path
+                        /home/webtools/jst/components.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The following sections briefly describe the components and
-			their component leads.
-		</p>
+                        The following sections briefly describe the components and
+                        their component leads.
+                </p>
 </td>
 </tr>
 <tr>
@@ -73,253 +73,253 @@
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="assembly">assembly</a>
-		</td>
+                        <a name="assembly">assembly</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The assembly component contains features definitions for
-			building the JST release, its SDK, and its test suite. The
-			component lead is Naci Dai.
-		</p>
+                        The assembly component contains features definitions for
+                        building the JST release, its SDK, and its test suite. The
+                        component lead is Naci Dai.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="jstcommon">common</a>
-		</td>
+                        <a name="jstcommon">common</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The common component contains common utilities and
-			infrastructure that does not find its home elsewhere. The
-			component lead is Naci Dai.
-		</p>
+                        The common component contains common utilities and
+                        infrastructure that does not find its home elsewhere. The
+                        component lead is Naci Dai.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="j2ee">j2ee</a>
-		</td>
+                        <a name="j2ee">j2ee</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The jst project component contains common j2ee models,
-			natures and builders for J2EE projects, and j2ee modules
-			views, wizards, etc. including the new support for flexible
-			project layouts. The component leads are Naci Dai and Chuck
-			Bridgham.
-			<ul>
-				
+                        The jst project component contains common j2ee models,
+                        natures and builders for J2EE projects, and j2ee modules
+                        views, wizards, etc. including the new support for flexible
+                        project layouts. The component leads are Naci Dai and Chuck
+                        Bridgham.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/j2ee_index.html">
-						J2EE Main page
-					</a>
-				
+                                                J2EE Main page
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/M4/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/M4/test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/M3/news/j2ee-news-m3.html">
-						M3 New and Noteworthy
-					</a>
-				
+                                                M3 New and Noteworthy
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="jsp">jsp</a>
-		</td>
+                        <a name="jsp">jsp</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The jsp component contains the JSP editor, model, views,
-			wizards, etc. The component lead is David Williams.
-			<ul>
-				
+                        The jsp component contains the JSP editor, model, views,
+                        wizards, etc. The component lead is David Williams.
+                        <ul>
+                                
 <li>
-					See
-					<a href="../wst/components/sse/m2/m2.html">
-						M2 New and Noteworthy: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="../wst/components/sse/m2/m2.html">
+                                                M2 New and Noteworthy: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/jsp/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/jsp/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/jsp/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="servlet">servlet</a>
-		</td>
+                        <a name="servlet">servlet</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The servlet component contains the servlet editors, models,
-			views, wizards, etc. The component lead is Naci Dai.
-			<ul>
-				
+                        The servlet component contains the servlet editors, models,
+                        views, wizards, etc. The component lead is Naci Dai.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/j2ee_index.html">
-						J2EE Main page(Servlet info found here)
-					</a>
-				
+                                                J2EE Main page(Servlet info found here)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="ejb">ejb</a>
-		</td>
+                        <a name="ejb">ejb</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The ejb component contains the ejb editors, models, views,
-			wizards, etc. The component lead is Naci Dai.
-			<ul>
-				
+                        The ejb component contains the ejb editors, models, views,
+                        wizards, etc. The component lead is Naci Dai.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/j2ee/j2ee_index.html">
-						J2EE Main page(EJB info found here)
-					</a>
-				
+                                                J2EE Main page(EJB info found here)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="jstserver">server</a>
-		</td>
+                        <a name="jstserver">server</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The server component contains the J2EE Server Tools
-			framework and adapters for selected popular J2EE servers
-			such as Apache Tomcat. The component leads are Naci Dai and
-			Tim deBoer.
-			<ul>
-				
+                        The server component contains the J2EE Server Tools
+                        framework and adapters for selected popular J2EE servers
+                        such as Apache Tomcat. The component leads are Naci Dai and
+                        Tim deBoer.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/server/index.html">Overview</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/server/test_plan.html">Test Plan</a>
-				
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="ws">ws</a>
-		</td>
+                        <a name="ws">ws</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The ws component contains the Java Web service wizard and
-			adapters for selected popular J2EE Web service engines such
-			as Apache Axis. The component lead is Chris Brealey.
-			<ul>
-				
+                        The ws component contains the Java Web service wizard and
+                        adapters for selected popular J2EE Web service engines such
+                        as Apache Axis. The component lead is Chris Brealey.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/ws/index.html">
-						Overview
-					</a>
-				
+                                                Overview
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/ws/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				
+                                                M3 Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/ws/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
diff --git a/jst/components.xml b/jst/components.xml
index 929c2c7..67241a3 100644
--- a/jst/components.xml
+++ b/jst/components.xml
@@ -1,207 +1,207 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type="text/xsl" href="../wtp.xsl"?>
 <html>
-	<head>
-		<title>j2ee standard tools components</title>
-	</head>
-	<body>
-		<h1>jst components</h1>
+        <head>
+                <title>j2ee standard tools components</title>
+        </head>
+        <body>
+                <h1>jst components</h1>
 
-		<h2>Introduction</h2>
-		<p>
-			This document describes the component structure for the J2EE
-			Standard Tools subproject. As the name of this subproject
-			implies, our scope includes J2EE standards, such as JSP,
-			servlet, EJB and related standards which are defined by the
-			JCP. This is in contrast to the Web Standard Tools
-			subproject whose scope is Web and related standards defined
-			by organizations such as W3C, OASIS, and ANSI. One of the
-			main organizing principles of this subproject is to group
-			all work related to a given standard within a single
-			component. For example, there are components for JSP editing
-			and J2EE projects. The other main organizing principle is to
-			create a component for each major framework. For example,
-			there are components for Server tools and the Web service
-			wizard. Finally, there are components for related sets of
-			code that do not fall into either of the two main
-			categorizations. For example, there is a common component
-			for utilities and other shared infrastructure code.
-		</p>
+                <h2>Introduction</h2>
+                <p>
+                        This document describes the component structure for the J2EE
+                        Standard Tools subproject. As the name of this subproject
+                        implies, our scope includes J2EE standards, such as JSP,
+                        servlet, EJB and related standards which are defined by the
+                        JCP. This is in contrast to the Web Standard Tools
+                        subproject whose scope is Web and related standards defined
+                        by organizations such as W3C, OASIS, and ANSI. One of the
+                        main organizing principles of this subproject is to group
+                        all work related to a given standard within a single
+                        component. For example, there are components for JSP editing
+                        and J2EE projects. The other main organizing principle is to
+                        create a component for each major framework. For example,
+                        there are components for Server tools and the Web service
+                        wizard. Finally, there are components for related sets of
+                        code that do not fall into either of the two main
+                        categorizations. For example, there is a common component
+                        for utilities and other shared infrastructure code.
+                </p>
 
-		<h3>
-			<a
-				href="http://dev.eclipse.org/viewcvs/index.cgi/jst/components/?cvsroot=WebTools_Project">
-				CVS Repository
-			</a>
-		</h3>
-		<p>
-			All JST components are stored in the Eclipse CVS repository
-			at dev.eclipse.org in the path
-			/home/webtools/jst/components.
-		</p>
-		<p>
-			The following sections briefly describe the components and
-			their component leads.
-		</p>
+                <h3>
+                        <a
+                                href="http://dev.eclipse.org/viewcvs/index.cgi/jst/components/?cvsroot=WebTools_Project">
+                                CVS Repository
+                        </a>
+                </h3>
+                <p>
+                        All JST components are stored in the Eclipse CVS repository
+                        at dev.eclipse.org in the path
+                        /home/webtools/jst/components.
+                </p>
+                <p>
+                        The following sections briefly describe the components and
+                        their component leads.
+                </p>
 
-		<h2>Components</h2>
+                <h2>Components</h2>
 
-		<h3>
-			<a name="assembly">assembly</a>
-		</h3>
-		<p>
-			The assembly component contains features definitions for
-			building the JST release, its SDK, and its test suite. The
-			component lead is Naci Dai.
-		</p>
+                <h3>
+                        <a name="assembly">assembly</a>
+                </h3>
+                <p>
+                        The assembly component contains features definitions for
+                        building the JST release, its SDK, and its test suite. The
+                        component lead is Naci Dai.
+                </p>
 
-		<h3>
-			<a name="jstcommon">common</a>
-		</h3>
-		<p>
-			The common component contains common utilities and
-			infrastructure that does not find its home elsewhere. The
-			component lead is Naci Dai.
-		</p>
+                <h3>
+                        <a name="jstcommon">common</a>
+                </h3>
+                <p>
+                        The common component contains common utilities and
+                        infrastructure that does not find its home elsewhere. The
+                        component lead is Naci Dai.
+                </p>
 
-		<h3>
-			<a name="j2ee">j2ee</a>
-		</h3>
-		<p>
-			The jst project component contains common j2ee models,
-			natures and builders for J2EE projects, and j2ee modules
-			views, wizards, etc. including the new support for flexible
-			project layouts. The component leads are Naci Dai and Chuck
-			Bridgham.
-			<ul>
-				<li>
-					<a href="components/j2ee/j2ee_index.html">
-						J2EE Main page
-					</a>
-				</li>
-				<li>
-					<a href="components/j2ee/M4/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/j2ee/M4/test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/j2ee/M3/news/j2ee-news-m3.html">
-						M3 New and Noteworthy
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="j2ee">j2ee</a>
+                </h3>
+                <p>
+                        The jst project component contains common j2ee models,
+                        natures and builders for J2EE projects, and j2ee modules
+                        views, wizards, etc. including the new support for flexible
+                        project layouts. The component leads are Naci Dai and Chuck
+                        Bridgham.
+                        <ul>
+                                <li>
+                                        <a href="components/j2ee/j2ee_index.html">
+                                                J2EE Main page
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/j2ee/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/j2ee/M4/test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/j2ee/M3/news/j2ee-news-m3.html">
+                                                M3 New and Noteworthy
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="jsp">jsp</a>
-		</h3>
-		<p>
-			The jsp component contains the JSP editor, model, views,
-			wizards, etc. The component lead is David Williams.
-			<ul>
-				<li>
-					See
-					<a href="../wst/components/sse/m2/m2.html">
-						M2 New and Noteworthy: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="jsp">jsp</a>
+                </h3>
+                <p>
+                        The jsp component contains the JSP editor, model, views,
+                        wizards, etc. The component lead is David Williams.
+                        <ul>
+                                <li>
+                                        See
+                                        <a href="../wst/components/sse/m2/m2.html">
+                                                M2 New and Noteworthy: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/jsp/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/jsp/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/jsp/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/jsp/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="servlet">servlet</a>
-		</h3>
-		<p>
-			The servlet component contains the servlet editors, models,
-			views, wizards, etc. The component lead is Naci Dai.
-			<ul>
-				<li>
-					<a href="components/j2ee/j2ee_index.html">
-						J2EE Main page(Servlet info found here)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="servlet">servlet</a>
+                </h3>
+                <p>
+                        The servlet component contains the servlet editors, models,
+                        views, wizards, etc. The component lead is Naci Dai.
+                        <ul>
+                                <li>
+                                        <a href="components/j2ee/j2ee_index.html">
+                                                J2EE Main page(Servlet info found here)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="ejb">ejb</a>
-		</h3>
-		<p>
-			The ejb component contains the ejb editors, models, views,
-			wizards, etc. The component lead is Naci Dai.
-			<ul>
-				<li>
-					<a href="components/j2ee/j2ee_index.html">
-						J2EE Main page(EJB info found here)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="ejb">ejb</a>
+                </h3>
+                <p>
+                        The ejb component contains the ejb editors, models, views,
+                        wizards, etc. The component lead is Naci Dai.
+                        <ul>
+                                <li>
+                                        <a href="components/j2ee/j2ee_index.html">
+                                                J2EE Main page(EJB info found here)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="jstserver">server</a>
-		</h3>
-		<p>
-			The server component contains the J2EE Server Tools
-			framework and adapters for selected popular J2EE servers
-			such as Apache Tomcat. The component leads are Naci Dai and
-			Tim deBoer.
-			<ul>
-				<li>
-					<a href="components/server/index.html">Overview</a>
-				</li>
-				<li>
-					<a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
-				</li>
-				<li>
-					<a href="components/server/test_plan.html">Test Plan</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="jstserver">server</a>
+                </h3>
+                <p>
+                        The server component contains the J2EE Server Tools
+                        framework and adapters for selected popular J2EE servers
+                        such as Apache Tomcat. The component leads are Naci Dai and
+                        Tim deBoer.
+                        <ul>
+                                <li>
+                                        <a href="components/server/index.html">Overview</a>
+                                </li>
+                                <li>
+                                        <a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
+                                </li>
+                                <li>
+                                        <a href="components/server/test_plan.html">Test Plan</a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="ws">ws</a>
-		</h3>
-		<p>
-			The ws component contains the Java Web service wizard and
-			adapters for selected popular J2EE Web service engines such
-			as Apache Axis. The component lead is Chris Brealey.
-			<ul>
-				<li>
-					<a href="components/ws/index.html">
-						Overview
-					</a>
-				</li>
-				<li>
-					<a href="components/ws/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/ws/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="ws">ws</a>
+                </h3>
+                <p>
+                        The ws component contains the Java Web service wizard and
+                        adapters for selected popular J2EE Web service engines such
+                        as Apache Axis. The component lead is Chris Brealey.
+                        <ul>
+                                <li>
+                                        <a href="components/ws/index.html">
+                                                Overview
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/ws/M3/milestone_plan.html">
+                                                M3 Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/ws/M4/milestone_plan.html">
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-	</body>
+        </body>
 </html>
diff --git a/wst/components.html b/wst/components.html
index 06bb92e..a2f638e 100644
--- a/wst/components.html
+++ b/wst/components.html
@@ -24,48 +24,48 @@
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			This document describes the component structure for the Web
-			Standard Tools subproject. As the name of this subproject
-			implies, our scope includes Web standards, such as HTML,
-			XML, and related standards which are defined by
-			organizations such as W3C, OASIS, and ANSI. This is in
-			contrast to the J2EE Standard Tools subproject whose scope
-			is the J2EE specification as defined by the JCP. One of the
-			main organizing principles of this subproject is to group
-			all work related to a given standard within a single
-			component. For example, there are components for HTML, XML,
-			and SQL. The other main organizing principle is to create a
-			component for each major framework. For example, there are
-			components for Server tools and Structure Source Editing.
-			Finally, there are components for related sets of code that
-			do not fall into either of the two main categorizations. For
-			example, there is a common component for utilities and other
-			shared infrastructure code.
-		</p>
+                        This document describes the component structure for the Web
+                        Standard Tools subproject. As the name of this subproject
+                        implies, our scope includes Web standards, such as HTML,
+                        XML, and related standards which are defined by
+                        organizations such as W3C, OASIS, and ANSI. This is in
+                        contrast to the J2EE Standard Tools subproject whose scope
+                        is the J2EE specification as defined by the JCP. One of the
+                        main organizing principles of this subproject is to group
+                        all work related to a given standard within a single
+                        component. For example, there are components for HTML, XML,
+                        and SQL. The other main organizing principle is to create a
+                        component for each major framework. For example, there are
+                        components for Server tools and Structure Source Editing.
+                        Finally, there are components for related sets of code that
+                        do not fall into either of the two main categorizations. For
+                        example, there is a common component for utilities and other
+                        shared infrastructure code.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a href="http://dev.eclipse.org/viewcvs/index.cgi/wst/components/?cvsroot=WebTools_Project">
-				CVS Repository
-			</a>
-		</td>
+                        <a href="http://dev.eclipse.org/viewcvs/index.cgi/wst/components/?cvsroot=WebTools_Project">
+                                CVS Repository
+                        </a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			All WST components are stored in the Eclipse CVS repository
-			at dev.eclipse.org in the path
-			/home/webtools/wst/components.
-		</p>
+                        All WST components are stored in the Eclipse CVS repository
+                        at dev.eclipse.org in the path
+                        /home/webtools/wst/components.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The following sections briefly describe the components and
-			their component leads.
-		</p>
+                        The following sections briefly describe the components and
+                        their component leads.
+                </p>
 </td>
 </tr>
 <tr>
@@ -73,793 +73,793 @@
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="wstassembly">assembly</a>
-		</td>
+                        <a name="wstassembly">assembly</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The assembly component contains features definitions for
-			building the WST release, its SDK, and its test suite. The
-			component leads are Deniz Se&ccedil;ilir and Dominique de
-			Vito.
-		</p>
+                        The assembly component contains features definitions for
+                        building the WST release, its SDK, and its test suite. The
+                        component leads are Deniz Se&ccedil;ilir and Dominique de
+                        Vito.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="command">command</a>
-		</td>
+                        <a name="command">command</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The command component contains command infrastructure
-			including the Environment Command framework and the Dynamic
-			Wizard framework. This infrastructure is required by the
-			webtooling project, but is not specific to webtooling per
-			se. We need to harmonize the several existing command
-			approaches. The component lead is Chris Brealey.
-			<ul>
-				
+                        The command component contains command infrastructure
+                        including the Environment Command framework and the Dynamic
+                        Wizard framework. This infrastructure is required by the
+                        webtooling project, but is not specific to webtooling per
+                        se. We need to harmonize the several existing command
+                        approaches. The component lead is Chris Brealey.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/command/index.html">
-						Overview
-					</a>
-				
+                                                Overview
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/command/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				
+                                                M3 Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/command/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="wstcommon">common</a>
-		</td>
+                        <a name="wstcommon">common</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The common component contains common utilities and
-			infrastructure which are required by the webtooling project,
-			but which are not specific to webtooling per se. The most
-			notable examples are the Extensible Navigator, Tabbed
-			Properties View, Snippets View, and Extensible URI Resolver.
-			The component lead is Craig Salter.
-			<ul>
-				
+                        The common component contains common utilities and
+                        infrastructure which are required by the webtooling project,
+                        but which are not specific to webtooling per se. The most
+                        notable examples are the Extensible Navigator, Tabbed
+                        Properties View, Snippets View, and Extensible URI Resolver.
+                        The component lead is Craig Salter.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="../jst/components/j2ee/j2ee_index.html">
-						J2EE Main page(Navigator info found here)
-					</a>
-				
+                                                J2EE Main page(Navigator info found here)
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/common/M3/encoding_milestone_plan.html">
-						Encoding: Current Milestone Plan
-					</a>
-				
+                                                Encoding: Current Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/common/M3/snippetsview_milestone_plan.html">
-						Snippets View: Current Milestone Plan
-					</a>
-				
+                                                Snippets View: Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="css">css</a>
-		</td>
+                        <a name="css">css</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The css component contains the CSS editor, model, views,
-			wizards, etc. The component lead is David Williams.
-			<ul>
-				
+                        The css component contains the CSS editor, model, views,
+                        wizards, etc. The component lead is David Williams.
+                        <ul>
+                                
 <li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/css/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/css/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/css/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
 
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="dtd">dtd</a>
-		</td>
+                        <a name="dtd">dtd</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The dtd component contains the DTD editor, model, views,
-			wizards, etc. The component lead is Nitin Dahyabhai.
-			<ul>
-				
+                        The dtd component contains the DTD editor, model, views,
+                        wizards, etc. The component lead is Nitin Dahyabhai.
+                        <ul>
+                                
 <li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/dtd/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/dtd/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/dtd/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="html">html</a>
-		</td>
+                        <a name="html">html</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The html component contains the HTML/XHTML editor, model,
-			views, wizards, etc. The component lead is David Williams.
-			<ul>
-				
+                        The html component contains the HTML/XHTML editor, model,
+                        views, wizards, etc. The component lead is David Williams.
+                        <ul>
+                                
 <li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/html/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/html/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/html/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="internet">internet</a>
-		</td>
+                        <a name="internet">internet</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The internet component contains Internet preferences (e.g.
-			proxy server configuration), Web browser support, and the
-			TCP/IP monitor. The component lead is Tim deBoer.
-			<ul>
-				
+                        The internet component contains Internet preferences (e.g.
+                        proxy server configuration), Web browser support, and the
+                        TCP/IP monitor. The component lead is Tim deBoer.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/internet/index.html">Overview</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/internet/M4/milestone_plan.html">Milestone Plan</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/internet/test_plan.html">Test Plan</a>
-				
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="javascript">javascript</a>
-		</td>
+                        <a name="javascript">javascript</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The javascript component contains the JavaScript editor,
-			model, views, wizards, etc. The component lead is David
-			Williams.
-			<ul>
-				
+                        The javascript component contains the JavaScript editor,
+                        model, views, wizards, etc. The component lead is David
+                        Williams.
+                        <ul>
+                                
 <li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/javascript/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/javascript/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/javascript/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="rdbsql">rdb</a>
-		</td>
+                        <a name="rdbsql">rdb</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The rdb component contains the relational database model
-			<a href="components/rdb/WebPublishedDBDefinitionModel/DBDefinition.htm">
-				DB Definition Model
-			</a>
-			,
-			<a href="components/rdb/DBDefinitionModelJavaDoc/index.html">
-				DB Definition Model Java Docs
-			</a>
-			, which is derived from
-			<a href="components/rdb/WebPublishedSQLModel/SQLModel.htm">
-				RDBModel - Based on SQL 99/2003
-			</a>
-			,
-			<a href="components/rdb/SQLModelJavaDoc/index.html">
-				RDBModel Java Docs
-			</a>
-			, vendor-specific database definitions and relational
-			utilities. It also provides a database server explorer with
-			the ability to connect to databases and sample data. A SQL
-			Scrapbook editor allows you to enter and execute SQL,
-			displaying the results in an Output view. The co-leads are
-			Der Ping Chou and Sheila Sholars.
-		</p>
+                        The rdb component contains the relational database model
+                        <a href="components/rdb/WebPublishedDBDefinitionModel/DBDefinition.htm">
+                                DB Definition Model
+                        </a>
+                        ,
+                        <a href="components/rdb/DBDefinitionModelJavaDoc/index.html">
+                                DB Definition Model Java Docs
+                        </a>
+                        , which is derived from
+                        <a href="components/rdb/WebPublishedSQLModel/SQLModel.htm">
+                                RDBModel - Based on SQL 99/2003
+                        </a>
+                        ,
+                        <a href="components/rdb/SQLModelJavaDoc/index.html">
+                                RDBModel Java Docs
+                        </a>
+                        , vendor-specific database definitions and relational
+                        utilities. It also provides a database server explorer with
+                        the ability to connect to databases and sample data. A SQL
+                        Scrapbook editor allows you to enter and execute SQL,
+                        displaying the results in an Output view. The co-leads are
+                        Der Ping Chou and Sheila Sholars.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <ul>
-			
+                        
 <li>
-				
+                                
 <a href="components/rdb/milestone_plan.html">
-					Milestone Plan
-				</a>
-			
+                                        Milestone Plan
+                                </a>
+                        
 </li>
-			
+                        
 <li>
-				
+                                
 <a href="components/rdb/test_plan.html">Test Plan</a>
-			
+                        
 </li>
-			
+                        
 <li>
-				
+                                
 <a href="components/rdb/wtp_datatools_testcases.htm">
-					Test Cases
-				</a>
-			
+                                        Test Cases
+                                </a>
+                        
 </li>
-			
+                        
 <li>
-				
+                                
 <a href="components/rdb/RDBTutorial.html">
-					Tutorial for RDB
-				</a>
-			
+                                        Tutorial for RDB
+                                </a>
+                        
 </li>
-			
+                        
 <li>
-				
+                                
 <a href="components/rdb/Data Tools Open Source Overview for Eclipse database Developer.html">
-					White Paper for RDB
-				</a>
-			
+                                        White Paper for RDB
+                                </a>
+                        
 </li>
-		
+                
 </ul>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="wstserver">server</a>
-		</td>
+                        <a name="wstserver">server</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The server component contains the Server Tools framework and
-			adapters for selected servers. At the WST level, the server
-			component is a very generic infrastructure. (The J2EE
-			specific server component is in JST). The component lead is
-			Tim deBoer.
-			<ul>
-				
+                        The server component contains the Server Tools framework and
+                        adapters for selected servers. At the WST level, the server
+                        component is a very generic infrastructure. (The J2EE
+                        specific server component is in JST). The component lead is
+                        Tim deBoer.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/server/index.html">Overview</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
-				
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/server/test_plan.html">Test Plan</a>
-				
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="sse">sse</a>
-		</td>
+                        <a name="sse">sse</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The sse component contains the Structured Source Editor
-			framework. This framework provides some abstract models and
-			ui infrastructure slightly above the base text
-			infrastructure but lower than any specific language which
-			uses it, such as XML, CSS, HTML, and JSP. The component lead
-			is David Williams.
-			<ul>
-				
+                        The sse component contains the Structured Source Editor
+                        framework. This framework provides some abstract models and
+                        ui infrastructure slightly above the base text
+                        infrastructure but lower than any specific language which
+                        uses it, such as XML, CSS, HTML, and JSP. The component lead
+                        is David Williams.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/sse/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
-<a href="components/sse/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/sse/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="validation">validation</a>
-		</td>
+                        <a name="validation">validation</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The validation component contains the Validation framework
-			which coordinates the registration and execution of
-			validators. Validators are a special form of an Eclipse
-			builder which (typically) does not produce derived output,
-			can have performance advantages, can be used for "batch"
-			validation, putting errors or warnings in the task view, and
-			sometimes can be (re)used for source page validation,
-			putting "temporary" annotation in editors. The
-			language/component validators, e.g HTML link checker, XSD
-			validator, and WSDL validator, are located in their specific
-			components, this Validation component simply provides the
-			framework. The component lead is Chuck Bridgham.
-			<ul>
-				
+                        The validation component contains the Validation framework
+                        which coordinates the registration and execution of
+                        validators. Validators are a special form of an Eclipse
+                        builder which (typically) does not produce derived output,
+                        can have performance advantages, can be used for "batch"
+                        validation, putting errors or warnings in the task view, and
+                        sometimes can be (re)used for source page validation,
+                        putting "temporary" annotation in editors. The
+                        language/component validators, e.g HTML link checker, XSD
+                        validator, and WSDL validator, are located in their specific
+                        components, this Validation component simply provides the
+                        framework. The component lead is Chuck Bridgham.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/validation/ValidationOverview.html">
-					   Validation Framework Overview
-					</a>
-				
+                                           Validation Framework Overview
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/validation/scenarios/validation_framework_testplan.html">
-					   M3 Validation Test Plan
-					</a>
-				
-</li>	
-				
+                                           M3 Validation Test Plan
+                                        </a>
+                                
+</li>
+                                
 <li>
-					 
+                                         
 <a href="../jst/components/j2ee/M4/milestone_plan.html">
-						Current Milestone M4 Plan - Available on J2EE Main page
-					</a>
-				
+                                                Current Milestone M4 Plan - Available on J2EE Main page
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="web">web</a>
-		</td>
+                        <a name="web">web</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The web component contains models, natures and builders for
-			Web projects. The component lead is Chuck Bridgham.
-			<ul>
-				
+                        The web component contains models, natures and builders for
+                        Web projects. The component lead is Chuck Bridgham.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="../jst/components/j2ee/j2ee_index.html">
-						J2EE Main page(Simple Web project info found
-						here)
-					</a>
-				
+                                                J2EE Main page(Simple Web project info found
+                                                here)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="ws">ws</a>
-		</td>
+                        <a name="ws">ws</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The ws component contains the Web Service explorer, SOAP,
-			UDDI, and WSIL models, and views. The component lead is
-			Chris Brealey.
-			<ul>
-				
+                        The ws component contains the Web Service explorer, SOAP,
+                        UDDI, and WSIL models, and views. The component lead is
+                        Chris Brealey.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/ws/index.html">
-						Overview
-					</a>
-				
+                                                Overview
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/ws/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				
+                                                M3 Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/ws/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="wsdl">wsdl</a>
-		</td>
+                        <a name="wsdl">wsdl</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The wsdl component contains the WSDL editor, model, views,
-			wizards, etc. The component lead is Craig Salter.
-			<ul>
-				
+                        The wsdl component contains the WSDL editor, model, views,
+                        wizards, etc. The component lead is Craig Salter.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/wsdl/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-			Tutorials
-			<ul>
-				
+                        Tutorials
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/wsdl/tutorials/WSDLEditorTutorial.html">
-						WSDL Editor Tutorial
-					</a>
-				
+                                                WSDL Editor Tutorial
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="wsi">wsi</a>
-		</td>
+                        <a name="wsi">wsi</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The wsi component contains WS-I Test Tools which will be
-			repatriated from the WSVT project. The component lead is
-			Craig Salter.
-		</p>
+                        The wsi component contains WS-I Test Tools which will be
+                        repatriated from the WSVT project. The component lead is
+                        Craig Salter.
+                </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="xml">xml</a>
-		</td>
+                        <a name="xml">xml</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The xml component contains the XML editor, model, views,
-			wizards, etc. It contains an incremental, fault tolerant DOM
-			parser, which is also the basis of several other similar
-			models in HTML and JSP. The component lead is David
-			Williams.
-			<ul>
-				
+                        The xml component contains the XML editor, model, views,
+                        wizards, etc. It contains an incremental, fault tolerant DOM
+                        parser, which is also the basis of several other similar
+                        models in HTML and JSP. The component lead is David
+                        Williams.
+                        <ul>
+                                
 <li>
-					
-<a href="components/xml/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                        
+<a href="components/xml/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/xml/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				
+                                                Current Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/xml/xml-catalog_M2TestPlan.html">
-						XML Catalog M2 Test Plan
-					</a>
-				
+                                                XML Catalog M2 Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-				    
+                                    
 <a href="components/xml/xml-dtd-xsd-validation_M2TestPlan.html">
-						XML, DTD, and XSD Validation M2 Test Plan
-					</a>
-				
+                                                XML, DTD, and XSD Validation M2 Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/xml/xml-examples_M2TestPlan.html">
-						XML Examples M2 Test Plan
-					</a>
-				
+                                                XML Examples M2 Test Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-			Tutorials
-			<ul>
-				
+                        Tutorials
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="../testtutorials/M2/xml/XMLCatalogTutorial.html">
-						XML Catalog Tutorial
-					</a>
-				
+                                                XML Catalog Tutorial
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="../testtutorials/M2/xml/XMLValidationTutorial.html">
-						XML Validation Tutorial
-					</a>
-				
+                                                XML Validation Tutorial
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="../testtutorials/M2/xml/XMLWizards.html">
-						Creating XML Documents Tutorial
-					</a>
-				
+                                                Creating XML Documents Tutorial
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-		
+                
 </p>
 </td>
 </tr>
 <tr>
 <td valign="top" align="right"><img width="16" height="16" border="0" src="../../images/Adarrow.gif"></td><td>
-			<a name="xmlschema">xsd</a>
-		</td>
+                        <a name="xmlschema">xsd</a>
+                </td>
 </tr>
 <tr>
 <td valign="top" align="right">&nbsp;</td><td valign="top">
 <p>
-			The xsd component contains the XSD editor, views, wizards,
-			etc. The component lead is Craig Salter.
-			<ul>
-				
+                        The xsd component contains the XSD editor, views, wizards,
+                        etc. The component lead is Craig Salter.
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="components/xsd/xsd-editor_M2TestPlan.html">
-						XML Schema Editor M2 Test Plan
-					</a>
-				
+                                                XML Schema Editor M2 Test Plan
+                                        </a>
+                                
 </li>
-				
+                                
 <li>
-					
+                                        
 <a href="components/xsd/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				
+                                                Current Milestone Plan
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
-			Tutorials
-			<ul>
-				
+                        Tutorials
+                        <ul>
+                                
 <li>
-					
+                                        
 <a href="../testtutorials/M2/xml/XMLSchemaEditorTutorial.html">
-						XML Schema Editor Tutorial
-					</a>
-				
+                                                XML Schema Editor Tutorial
+                                        </a>
+                                
 </li>
-			
+                        
 </ul>
 
-		
+                
 </p>
 </td>
 </tr>
diff --git a/wst/components.xml b/wst/components.xml
index c284c47..971c274 100644
--- a/wst/components.xml
+++ b/wst/components.xml
@@ -1,580 +1,580 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type="text/xsl" href="../wtp.xsl"?>
 <html>
-	<head>
-		<title>web standard tools components</title>
-	</head>
-	<body>
-		<h1>wst components</h1>
+        <head>
+                <title>web standard tools components</title>
+        </head>
+        <body>
+                <h1>wst components</h1>
 
-		<h2>Introduction</h2>
-		<p>
-			This document describes the component structure for the Web
-			Standard Tools subproject. As the name of this subproject
-			implies, our scope includes Web standards, such as HTML,
-			XML, and related standards which are defined by
-			organizations such as W3C, OASIS, and ANSI. This is in
-			contrast to the J2EE Standard Tools subproject whose scope
-			is the J2EE specification as defined by the JCP. One of the
-			main organizing principles of this subproject is to group
-			all work related to a given standard within a single
-			component. For example, there are components for HTML, XML,
-			and SQL. The other main organizing principle is to create a
-			component for each major framework. For example, there are
-			components for Server tools and Structure Source Editing.
-			Finally, there are components for related sets of code that
-			do not fall into either of the two main categorizations. For
-			example, there is a common component for utilities and other
-			shared infrastructure code.
-		</p>
+                <h2>Introduction</h2>
+                <p>
+                        This document describes the component structure for the Web
+                        Standard Tools subproject. As the name of this subproject
+                        implies, our scope includes Web standards, such as HTML,
+                        XML, and related standards which are defined by
+                        organizations such as W3C, OASIS, and ANSI. This is in
+                        contrast to the J2EE Standard Tools subproject whose scope
+                        is the J2EE specification as defined by the JCP. One of the
+                        main organizing principles of this subproject is to group
+                        all work related to a given standard within a single
+                        component. For example, there are components for HTML, XML,
+                        and SQL. The other main organizing principle is to create a
+                        component for each major framework. For example, there are
+                        components for Server tools and Structure Source Editing.
+                        Finally, there are components for related sets of code that
+                        do not fall into either of the two main categorizations. For
+                        example, there is a common component for utilities and other
+                        shared infrastructure code.
+                </p>
 
-		<h3>
-			<a
-				href="http://dev.eclipse.org/viewcvs/index.cgi/wst/components/?cvsroot=WebTools_Project">
-				CVS Repository
-			</a>
-		</h3>
-		<p>
-			All WST components are stored in the Eclipse CVS repository
-			at dev.eclipse.org in the path
-			/home/webtools/wst/components.
-		</p>
-		<p>
-			The following sections briefly describe the components and
-			their component leads.
-		</p>
+                <h3>
+                        <a
+                                href="http://dev.eclipse.org/viewcvs/index.cgi/wst/components/?cvsroot=WebTools_Project">
+                                CVS Repository
+                        </a>
+                </h3>
+                <p>
+                        All WST components are stored in the Eclipse CVS repository
+                        at dev.eclipse.org in the path
+                        /home/webtools/wst/components.
+                </p>
+                <p>
+                        The following sections briefly describe the components and
+                        their component leads.
+                </p>
 
-		<h2>Components</h2>
+                <h2>Components</h2>
 
-		<h3>
-			<a name="wstassembly">assembly</a>
-		</h3>
-		<p>
-			The assembly component contains features definitions for
-			building the WST release, its SDK, and its test suite. The
-			component leads are Deniz Se&#231;ilir and Dominique de
-			Vito.
-		</p>
+                <h3>
+                        <a name="wstassembly">assembly</a>
+                </h3>
+                <p>
+                        The assembly component contains features definitions for
+                        building the WST release, its SDK, and its test suite. The
+                        component leads are Deniz Se&#231;ilir and Dominique de
+                        Vito.
+                </p>
 
-		<h3>
-			<a name="command">command</a>
-		</h3>
-		<p>
-			The command component contains command infrastructure
-			including the Environment Command framework and the Dynamic
-			Wizard framework. This infrastructure is required by the
-			webtooling project, but is not specific to webtooling per
-			se. We need to harmonize the several existing command
-			approaches. The component lead is Chris Brealey.
-			<ul>
-				<li>
-					<a href="components/command/index.html">
-						Overview
-					</a>
-				</li>
-				<li>
-					<a href="components/command/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/command/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="command">command</a>
+                </h3>
+                <p>
+                        The command component contains command infrastructure
+                        including the Environment Command framework and the Dynamic
+                        Wizard framework. This infrastructure is required by the
+                        webtooling project, but is not specific to webtooling per
+                        se. We need to harmonize the several existing command
+                        approaches. The component lead is Chris Brealey.
+                        <ul>
+                                <li>
+                                        <a href="components/command/index.html">
+                                                Overview
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/command/M3/milestone_plan.html">
+                                                M3 Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/command/M4/milestone_plan.html">
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="wstcommon">common</a>
-		</h3>
-		<p>
-			The common component contains common utilities and
-			infrastructure which are required by the webtooling project,
-			but which are not specific to webtooling per se. The most
-			notable examples are the Extensible Navigator, Tabbed
-			Properties View, Snippets View, and Extensible URI Resolver.
-			The component lead is Craig Salter.
-			<ul>
-				<li>
-					<a href="../jst/components/j2ee/j2ee_index.html">
-						J2EE Main page(Navigator info found here)
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/common/M3/encoding_milestone_plan.html">
-						Encoding: Current Milestone Plan
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/common/M3/snippetsview_milestone_plan.html">
-						Snippets View: Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="wstcommon">common</a>
+                </h3>
+                <p>
+                        The common component contains common utilities and
+                        infrastructure which are required by the webtooling project,
+                        but which are not specific to webtooling per se. The most
+                        notable examples are the Extensible Navigator, Tabbed
+                        Properties View, Snippets View, and Extensible URI Resolver.
+                        The component lead is Craig Salter.
+                        <ul>
+                                <li>
+                                        <a href="../jst/components/j2ee/j2ee_index.html">
+                                                J2EE Main page(Navigator info found here)
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/common/M3/encoding_milestone_plan.html">
+                                                Encoding: Current Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/common/M3/snippetsview_milestone_plan.html">
+                                                Snippets View: Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="css">css</a>
-		</h3>
-		<p>
-			The css component contains the CSS editor, model, views,
-			wizards, etc. The component lead is David Williams.
-			<ul>
-				<li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="css">css</a>
+                </h3>
+                <p>
+                        The css component contains the CSS editor, model, views,
+                        wizards, etc. The component lead is David Williams.
+                        <ul>
+                                <li>
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/css/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/css/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/css/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/css/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
 
-			</ul>
-		</p>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="dtd">dtd</a>
-		</h3>
-		<p>
-			The dtd component contains the DTD editor, model, views,
-			wizards, etc. The component lead is Nitin Dahyabhai.
-			<ul>
-				<li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="dtd">dtd</a>
+                </h3>
+                <p>
+                        The dtd component contains the DTD editor, model, views,
+                        wizards, etc. The component lead is Nitin Dahyabhai.
+                        <ul>
+                                <li>
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a href="components/dtd/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/dtd/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/dtd/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/dtd/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="html">html</a>
-		</h3>
-		<p>
-			The html component contains the HTML/XHTML editor, model,
-			views, wizards, etc. The component lead is David Williams.
-			<ul>
-				<li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="html">html</a>
+                </h3>
+                <p>
+                        The html component contains the HTML/XHTML editor, model,
+                        views, wizards, etc. The component lead is David Williams.
+                        <ul>
+                                <li>
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a href="components/html/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/html/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/html/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/html/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="internet">internet</a>
-		</h3>
-		<p>
-			The internet component contains Internet preferences (e.g.
-			proxy server configuration), Web browser support, and the
-			TCP/IP monitor. The component lead is Tim deBoer.
-			<ul>
-				<li>
-					<a href="components/internet/index.html">Overview</a>
-				</li>
-				<li>
-					<a	href="components/internet/M4/milestone_plan.html">Milestone Plan</a>
-				</li>
-				<li>
-					<a href="components/internet/test_plan.html">Test Plan</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="internet">internet</a>
+                </h3>
+                <p>
+                        The internet component contains Internet preferences (e.g.
+                        proxy server configuration), Web browser support, and the
+                        TCP/IP monitor. The component lead is Tim deBoer.
+                        <ul>
+                                <li>
+                                        <a href="components/internet/index.html">Overview</a>
+                                </li>
+                                <li>
+                                        <a      href="components/internet/M4/milestone_plan.html">Milestone Plan</a>
+                                </li>
+                                <li>
+                                        <a href="components/internet/test_plan.html">Test Plan</a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="javascript">javascript</a>
-		</h3>
-		<p>
-			The javascript component contains the JavaScript editor,
-			model, views, wizards, etc. The component lead is David
-			Williams.
-			<ul>
-				<li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="javascript">javascript</a>
+                </h3>
+                <p>
+                        The javascript component contains the JavaScript editor,
+                        model, views, wizards, etc. The component lead is David
+                        Williams.
+                        <ul>
+                                <li>
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/javascript/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/javascript/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/javascript/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/javascript/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="rdbsql">rdb</a>
-		</h3>
-		<p>
-			The rdb component contains the relational database model
-			<a href="components/rdb/WebPublishedDBDefinitionModel/DBDefinition.htm">
-				DB Definition Model
-			</a>
-			,
-			<a href="components/rdb/DBDefinitionModelJavaDoc/index.html">
-				DB Definition Model Java Docs
-			</a>
-			, which is derived from
-			<a
-				href="components/rdb/WebPublishedSQLModel/SQLModel.htm">
-				RDBModel - Based on SQL 99/2003
-			</a>
-			,
-			<a href="components/rdb/SQLModelJavaDoc/index.html">
-				RDBModel Java Docs
-			</a>
-			, vendor-specific database definitions and relational
-			utilities. It also provides a database server explorer with
-			the ability to connect to databases and sample data. A SQL
-			Scrapbook editor allows you to enter and execute SQL,
-			displaying the results in an Output view. The co-leads are
-			Der Ping Chou and Sheila Sholars.
-		</p>
+                <h3>
+                        <a name="rdbsql">rdb</a>
+                </h3>
+                <p>
+                        The rdb component contains the relational database model
+                        <a href="components/rdb/WebPublishedDBDefinitionModel/DBDefinition.htm">
+                                DB Definition Model
+                        </a>
+                        ,
+                        <a href="components/rdb/DBDefinitionModelJavaDoc/index.html">
+                                DB Definition Model Java Docs
+                        </a>
+                        , which is derived from
+                        <a
+                                href="components/rdb/WebPublishedSQLModel/SQLModel.htm">
+                                RDBModel - Based on SQL 99/2003
+                        </a>
+                        ,
+                        <a href="components/rdb/SQLModelJavaDoc/index.html">
+                                RDBModel Java Docs
+                        </a>
+                        , vendor-specific database definitions and relational
+                        utilities. It also provides a database server explorer with
+                        the ability to connect to databases and sample data. A SQL
+                        Scrapbook editor allows you to enter and execute SQL,
+                        displaying the results in an Output view. The co-leads are
+                        Der Ping Chou and Sheila Sholars.
+                </p>
 
-		<ul>
-			<li>
-				<a href="components/rdb/milestone_plan.html">
-					Milestone Plan
-				</a>
-			</li>
-			<li>
-				<a href="components/rdb/test_plan.html">Test Plan</a>
-			</li>
-			<li>
-				<a href="components/rdb/wtp_datatools_testcases.htm">
-					Test Cases
-				</a>
-			</li>
-			<li>
-				<a href="components/rdb/RDBTutorial.html">
-					Tutorial for RDB
-				</a>
-			</li>
-			<li>
-				<a
-					href="components/rdb/Data Tools Open Source Overview for Eclipse database Developer.html">
-					White Paper for RDB
-				</a>
-			</li>
-		</ul>
+                <ul>
+                        <li>
+                                <a href="components/rdb/milestone_plan.html">
+                                        Milestone Plan
+                                </a>
+                        </li>
+                        <li>
+                                <a href="components/rdb/test_plan.html">Test Plan</a>
+                        </li>
+                        <li>
+                                <a href="components/rdb/wtp_datatools_testcases.htm">
+                                        Test Cases
+                                </a>
+                        </li>
+                        <li>
+                                <a href="components/rdb/RDBTutorial.html">
+                                        Tutorial for RDB
+                                </a>
+                        </li>
+                        <li>
+                                <a
+                                        href="components/rdb/Data Tools Open Source Overview for Eclipse database Developer.html">
+                                        White Paper for RDB
+                                </a>
+                        </li>
+                </ul>
 
-		<h3>
-			<a name="wstserver">server</a>
-		</h3>
-		<p>
-			The server component contains the Server Tools framework and
-			adapters for selected servers. At the WST level, the server
-			component is a very generic infrastructure. (The J2EE
-			specific server component is in JST). The component lead is
-			Tim deBoer.
-			<ul>
-				<li>
-					<a href="components/server/index.html">Overview</a>
-				</li>
-				<li>
-					<a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
-				</li>
-				<li>
-					<a href="components/server/test_plan.html">Test Plan</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="wstserver">server</a>
+                </h3>
+                <p>
+                        The server component contains the Server Tools framework and
+                        adapters for selected servers. At the WST level, the server
+                        component is a very generic infrastructure. (The J2EE
+                        specific server component is in JST). The component lead is
+                        Tim deBoer.
+                        <ul>
+                                <li>
+                                        <a href="components/server/index.html">Overview</a>
+                                </li>
+                                <li>
+                                        <a href="components/server/M4/milestone_plan.html">Milestone Plan</a>
+                                </li>
+                                <li>
+                                        <a href="components/server/test_plan.html">Test Plan</a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="sse">sse</a>
-		</h3>
-		<p>
-			The sse component contains the Structured Source Editor
-			framework. This framework provides some abstract models and
-			ui infrastructure slightly above the base text
-			infrastructure but lower than any specific language which
-			uses it, such as XML, CSS, HTML, and JSP. The component lead
-			is David Williams.
-			<ul>
-				<li>
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="sse">sse</a>
+                </h3>
+                <p>
+                        The sse component contains the Structured Source Editor
+                        framework. This framework provides some abstract models and
+                        ui infrastructure slightly above the base text
+                        infrastructure but lower than any specific language which
+                        uses it, such as XML, CSS, HTML, and JSP. The component lead
+                        is David Williams.
+                        <ul>
+                                <li>
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/sse/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/sse/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/sse/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/sse/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="validation">validation</a>
-		</h3>
-		<p>
-			The validation component contains the Validation framework
-			which coordinates the registration and execution of
-			validators. Validators are a special form of an Eclipse
-			builder which (typically) does not produce derived output,
-			can have performance advantages, can be used for "batch"
-			validation, putting errors or warnings in the task view, and
-			sometimes can be (re)used for source page validation,
-			putting "temporary" annotation in editors. The
-			language/component validators, e.g HTML link checker, XSD
-			validator, and WSDL validator, are located in their specific
-			components, this Validation component simply provides the
-			framework. The component lead is Chuck Bridgham.
-			<ul>
-				<li>
-					<a href="components/validation/ValidationOverview.html">
-					   Validation Framework Overview
-					</a>
-				</li>
-				<li>
-					<a
-					   href="components/validation/scenarios/validation_framework_testplan.html">
-					   M3 Validation Test Plan
-					</a>
-				</li>	
-				<li>
-					 <a
-						href="../jst/components/j2ee/M4/milestone_plan.html">
-						Current Milestone M4 Plan - Available on J2EE Main page
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="validation">validation</a>
+                </h3>
+                <p>
+                        The validation component contains the Validation framework
+                        which coordinates the registration and execution of
+                        validators. Validators are a special form of an Eclipse
+                        builder which (typically) does not produce derived output,
+                        can have performance advantages, can be used for "batch"
+                        validation, putting errors or warnings in the task view, and
+                        sometimes can be (re)used for source page validation,
+                        putting "temporary" annotation in editors. The
+                        language/component validators, e.g HTML link checker, XSD
+                        validator, and WSDL validator, are located in their specific
+                        components, this Validation component simply provides the
+                        framework. The component lead is Chuck Bridgham.
+                        <ul>
+                                <li>
+                                        <a href="components/validation/ValidationOverview.html">
+                                           Validation Framework Overview
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                           href="components/validation/scenarios/validation_framework_testplan.html">
+                                           M3 Validation Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                         <a
+                                                href="../jst/components/j2ee/M4/milestone_plan.html">
+                                                Current Milestone M4 Plan - Available on J2EE Main page
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="web">web</a>
-		</h3>
-		<p>
-			The web component contains models, natures and builders for
-			Web projects. The component lead is Chuck Bridgham.
-			<ul>
-				<li>
-					<a href="../jst/components/j2ee/j2ee_index.html">
-						J2EE Main page(Simple Web project info found
-						here)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="web">web</a>
+                </h3>
+                <p>
+                        The web component contains models, natures and builders for
+                        Web projects. The component lead is Chuck Bridgham.
+                        <ul>
+                                <li>
+                                        <a href="../jst/components/j2ee/j2ee_index.html">
+                                                J2EE Main page(Simple Web project info found
+                                                here)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="ws">ws</a>
-		</h3>
-		<p>
-			The ws component contains the Web Service explorer, SOAP,
-			UDDI, and WSIL models, and views. The component lead is
-			Chris Brealey.
-			<ul>
-				<li>
-					<a href="components/ws/index.html">
-						Overview
-					</a>
-				</li>
-				<li>
-					<a href="components/ws/M3/milestone_plan.html">
-						M3 Milestone Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/ws/M4/milestone_plan.html">
-						M4 Milestone Plan (under construction)
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="ws">ws</a>
+                </h3>
+                <p>
+                        The ws component contains the Web Service explorer, SOAP,
+                        UDDI, and WSIL models, and views. The component lead is
+                        Chris Brealey.
+                        <ul>
+                                <li>
+                                        <a href="components/ws/index.html">
+                                                Overview
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/ws/M3/milestone_plan.html">
+                                                M3 Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/ws/M4/milestone_plan.html">
+                                                M4 Milestone Plan (under construction)
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="wsdl">wsdl</a>
-		</h3>
-		<p>
-			The wsdl component contains the WSDL editor, model, views,
-			wizards, etc. The component lead is Craig Salter.
-			<ul>
-				<li>
-					<a href="components/wsdl/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-			Tutorials
-			<ul>
-				<li>
-					<a
-						href="components/wsdl/tutorials/WSDLEditorTutorial.html">
-						WSDL Editor Tutorial
-					</a>
-				</li>
-			</ul>
-		</p>
+                <h3>
+                        <a name="wsdl">wsdl</a>
+                </h3>
+                <p>
+                        The wsdl component contains the WSDL editor, model, views,
+                        wizards, etc. The component lead is Craig Salter.
+                        <ul>
+                                <li>
+                                        <a href="components/wsdl/M3/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                        Tutorials
+                        <ul>
+                                <li>
+                                        <a
+                                                href="components/wsdl/tutorials/WSDLEditorTutorial.html">
+                                                WSDL Editor Tutorial
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="wsi">wsi</a>
-		</h3>
-		<p>
-			The wsi component contains WS-I Test Tools which will be
-			repatriated from the WSVT project. The component lead is
-			Craig Salter.
-		</p>
+                <h3>
+                        <a name="wsi">wsi</a>
+                </h3>
+                <p>
+                        The wsi component contains WS-I Test Tools which will be
+                        repatriated from the WSVT project. The component lead is
+                        Craig Salter.
+                </p>
 
-		<h3>
-			<a name="xml">xml</a>
-		</h3>
-		<p>
-			The xml component contains the XML editor, model, views,
-			wizards, etc. It contains an incremental, fault tolerant DOM
-			parser, which is also the basis of several other similar
-			models in HTML and JSP. The component lead is David
-			Williams.
-			<ul>
-				<li>
-					<a href="components/xml/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-				<li>
-					See
-					<a href="components/sse/m2/m2.html">
-						M2 New and Noteworty: Reintroducing the
-						Structured Source Editing family of editors
+                <h3>
+                        <a name="xml">xml</a>
+                </h3>
+                <p>
+                        The xml component contains the XML editor, model, views,
+                        wizards, etc. It contains an incremental, fault tolerant DOM
+                        parser, which is also the basis of several other similar
+                        models in HTML and JSP. The component lead is David
+                        Williams.
+                        <ul>
+                                <li>
+                                        <a href="components/xml/M4/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        See
+                                        <a href="components/sse/m2/m2.html">
+                                                M2 New and Noteworty: Reintroducing the
+                                                Structured Source Editing family of editors
 
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/xml/M3/milestone_test_plan.html">
-						Current Test Plan
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/xml/xml-catalog_M2TestPlan.html">
-						XML Catalog M2 Test Plan
-					</a>
-				</li>
-				<li>
-				    <a
-						href="components/xml/xml-dtd-xsd-validation_M2TestPlan.html">
-						XML, DTD, and XSD Validation M2 Test Plan
-					</a>
-				</li>
-				<li>
-					<a
-						href="components/xml/xml-examples_M2TestPlan.html">
-						XML Examples M2 Test Plan
-					</a>
-				</li>
-			</ul>
-			Tutorials
-			<ul>
-				<li>
-					<a
-						href="../testtutorials/M2/xml/XMLCatalogTutorial.html">
-						XML Catalog Tutorial
-					</a>
-				</li>
-				<li>
-					<a
-						href="../testtutorials/M2/xml/XMLValidationTutorial.html">
-						XML Validation Tutorial
-					</a>
-				</li>
-				<li>
-					<a href="../testtutorials/M2/xml/XMLWizards.html">
-						Creating XML Documents Tutorial
-					</a>
-				</li>
-			</ul>
-		</p>
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/xml/M3/milestone_test_plan.html">
+                                                Current Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/xml/xml-catalog_M2TestPlan.html">
+                                                XML Catalog M2 Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                    <a
+                                                href="components/xml/xml-dtd-xsd-validation_M2TestPlan.html">
+                                                XML, DTD, and XSD Validation M2 Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="components/xml/xml-examples_M2TestPlan.html">
+                                                XML Examples M2 Test Plan
+                                        </a>
+                                </li>
+                        </ul>
+                        Tutorials
+                        <ul>
+                                <li>
+                                        <a
+                                                href="../testtutorials/M2/xml/XMLCatalogTutorial.html">
+                                                XML Catalog Tutorial
+                                        </a>
+                                </li>
+                                <li>
+                                        <a
+                                                href="../testtutorials/M2/xml/XMLValidationTutorial.html">
+                                                XML Validation Tutorial
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="../testtutorials/M2/xml/XMLWizards.html">
+                                                Creating XML Documents Tutorial
+                                        </a>
+                                </li>
+                        </ul>
+                </p>
 
-		<h3>
-			<a name="xmlschema">xsd</a>
-		</h3>
-		<p>
-			The xsd component contains the XSD editor, views, wizards,
-			etc. The component lead is Craig Salter.
-			<ul>
-				<li>
-					<a
-						href="components/xsd/xsd-editor_M2TestPlan.html">
-						XML Schema Editor M2 Test Plan
-					</a>
-				</li>
-				<li>
-					<a href="components/xsd/M3/milestone_plan.html">
-						Current Milestone Plan
-					</a>
-				</li>
-			</ul>
-			Tutorials
-			<ul>
-				<li>
-					<a
-						href="../testtutorials/M2/xml/XMLSchemaEditorTutorial.html">
-						XML Schema Editor Tutorial
-					</a>
-				</li>
-			</ul>
+                <h3>
+                        <a name="xmlschema">xsd</a>
+                </h3>
+                <p>
+                        The xsd component contains the XSD editor, views, wizards,
+                        etc. The component lead is Craig Salter.
+                        <ul>
+                                <li>
+                                        <a
+                                                href="components/xsd/xsd-editor_M2TestPlan.html">
+                                                XML Schema Editor M2 Test Plan
+                                        </a>
+                                </li>
+                                <li>
+                                        <a href="components/xsd/M3/milestone_plan.html">
+                                                Current Milestone Plan
+                                        </a>
+                                </li>
+                        </ul>
+                        Tutorials
+                        <ul>
+                                <li>
+                                        <a
+                                                href="../testtutorials/M2/xml/XMLSchemaEditorTutorial.html">
+                                                XML Schema Editor Tutorial
+                                        </a>
+                                </li>
+                        </ul>
 
-		</p>
+                </p>
 
-	</body>
+        </body>
 </html>