You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2007/08/15 00:09:05 UTC

svn commit: r565945 [1/2] - in /myfaces/site/trunk/src/site: ./ xdoc/ xdoc/community/ xdoc/docs/ xdoc/project_management/

Author: grantsmith
Date: Tue Aug 14 15:09:03 2007
New Revision: 565945

URL: http://svn.apache.org/viewvc?view=rev&rev=565945
Log:
xdocs cosmetics - fixed awful intentation and line spacings

Modified:
    myfaces/site/trunk/src/site/site.xml
    myfaces/site/trunk/src/site/xdoc/binary.xml
    myfaces/site/trunk/src/site/xdoc/buildhowto.xml
    myfaces/site/trunk/src/site/xdoc/cardemoweb.xml
    myfaces/site/trunk/src/site/xdoc/community/javaone2005.xml
    myfaces/site/trunk/src/site/xdoc/community/javaone2005_cometogether.xml
    myfaces/site/trunk/src/site/xdoc/community/javaone2005_session.xml
    myfaces/site/trunk/src/site/xdoc/community/poweredbymyfaces.xml
    myfaces/site/trunk/src/site/xdoc/compatibility.xml
    myfaces/site/trunk/src/site/xdoc/docs/bootstrap.xml
    myfaces/site/trunk/src/site/xdoc/docs/jars.xml
    myfaces/site/trunk/src/site/xdoc/docs/portlet.xml
    myfaces/site/trunk/src/site/xdoc/docs/sf.xml
    myfaces/site/trunk/src/site/xdoc/docs/tomcat4x.xml
    myfaces/site/trunk/src/site/xdoc/docs/tomcat55.xml
    myfaces/site/trunk/src/site/xdoc/faq.xml
    myfaces/site/trunk/src/site/xdoc/gettingstarted.xml
    myfaces/site/trunk/src/site/xdoc/issue.xml
    myfaces/site/trunk/src/site/xdoc/javadoc.xml
    myfaces/site/trunk/src/site/xdoc/livesites.xml
    myfaces/site/trunk/src/site/xdoc/mailinglists.xml
    myfaces/site/trunk/src/site/xdoc/project_management/bylaws.xml
    myfaces/site/trunk/src/site/xdoc/project_management/legal.xml
    myfaces/site/trunk/src/site/xdoc/risamples.xml
    myfaces/site/trunk/src/site/xdoc/source.xml
    myfaces/site/trunk/src/site/xdoc/svn.xml
    myfaces/site/trunk/src/site/xdoc/tomcat.xml
    myfaces/site/trunk/src/site/xdoc/xdoc.xml

Modified: myfaces/site/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/site.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/site.xml (original)
+++ myfaces/site/trunk/src/site/site.xml Tue Aug 14 15:09:03 2007
@@ -16,57 +16,57 @@
  * limitations under the License.
 -->
 <project name="MyFaces">
-  <bannerLeft>
-    <name>MyFaces</name>
-    <src>images/myfaces-logo.png</src>
-    <href>http://myfaces.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>Easter Island</name>
-    <src>images/easter.png</src>
-    <href>http://myfaces.apache.org/</href>
-  </bannerRight>  
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/"/>
-      <item name="MyFaces" href="index.html"/>
-      <item name="API" href="api/index.html"/>
-      <item name="Impl" href="impl/index.html"/>
-      <item name="Tomahawk" href="tomahawk/index.html"/>
-      <item name="Sandbox" href="sandbox/index.html"/>
-      <item name="Tobago" href="tobago/index.html"/>
-      <item name="Trinidad" href="trinidad/index.html"/>
-	    <item name="Orchestra" href="orchestra/index.html"/>
-    </links>
-    
-    <menu name="Apache MyFaces">
-      <item name="News archive" href="news-archive.html"/>
-      <item name="Download" href="download.html" />
-      <item name="Mailing Lists" href="mail-lists.html" />
-    </menu>
+    <bannerLeft>
+        <name>MyFaces</name>
+        <src>images/myfaces-logo.png</src>
+        <href>http://myfaces.apache.org/</href>
+    </bannerLeft>
+    <bannerRight>
+        <name>Easter Island</name>
+        <src>images/easter.png</src>
+        <href>http://myfaces.apache.org/</href>
+    </bannerRight>
+    <body>
+        <links>
+            <item name="Apache" href="http://www.apache.org/"/>
+            <item name="MyFaces" href="index.html"/>
+            <item name="API" href="api/index.html"/>
+            <item name="Impl" href="impl/index.html"/>
+            <item name="Tomahawk" href="tomahawk/index.html"/>
+            <item name="Sandbox" href="sandbox/index.html"/>
+            <item name="Tobago" href="tobago/index.html"/>
+            <item name="Trinidad" href="trinidad/index.html"/>
+            <item name="Orchestra" href="orchestra/index.html"/>
+        </links>
 
-    <menu name="MyFaces Projects">
-      <item name="Overview" href="index.html"/>
-      <item name="API" href="api/index.html"/>
-      <item name="Impl" href="impl/index.html"/>
-      <item name="Tomahawk" href="tomahawk/index.html"/>
-      <item name="Sandbox" href="sandbox/index.html"/>
-      <item name="Tobago" href="tobago/index.html"/>
-      <item name="Trinidad" href="trinidad/index.html"/>
-	    <item name="Orchestra" href="orchestra/index.html"/>
-    </menu>
+        <menu name="Apache MyFaces">
+            <item name="News archive" href="news-archive.html"/>
+            <item name="Download" href="download.html" />
+            <item name="Mailing Lists" href="mail-lists.html" />
+        </menu>
 
-    <menu name="Documentation">
-      <item name="Getting Started" href="gettingstarted.html"/>
-      <item name="MyFaces and RI" href="risamples.html"/>  
-      <item name="FAQ" href="faq.html"/>  
-      <item name="Javadoc" href="javadoc.html"/>  
-      <item name="Wiki" href="http://wiki.apache.org/myfaces"/>  
-      <item name="Compatibility" href="compatibility.html"/>  
-      <item name="Tomcat Configuration" href="tomcat.html"/>  
-    </menu>    
+        <menu name="MyFaces Projects">
+            <item name="Overview" href="index.html"/>
+            <item name="API" href="api/index.html"/>
+            <item name="Impl" href="impl/index.html"/>
+            <item name="Tomahawk" href="tomahawk/index.html"/>
+            <item name="Sandbox" href="sandbox/index.html"/>
+            <item name="Tobago" href="tobago/index.html"/>
+            <item name="Trinidad" href="trinidad/index.html"/>
+            <item name="Orchestra" href="orchestra/index.html"/>
+        </menu>
 
-    ${reports}
-    
-  </body>
+        <menu name="Documentation">
+            <item name="Getting Started" href="gettingstarted.html"/>
+            <item name="MyFaces and RI" href="risamples.html"/>
+            <item name="FAQ" href="faq.html"/>
+            <item name="Javadoc" href="javadoc.html"/>
+            <item name="Wiki" href="http://wiki.apache.org/myfaces"/>
+            <item name="Compatibility" href="compatibility.html"/>
+            <item name="Tomcat Configuration" href="tomcat.html"/>
+        </menu>
+
+        ${reports}
+
+    </body>
 </project>

Modified: myfaces/site/trunk/src/site/xdoc/binary.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/binary.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/binary.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/binary.xml Tue Aug 14 15:09:03 2007
@@ -15,21 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
+
 <!-- Note: To understand how this template is used, see the documentation
   at http://forrest.apache.org/howto/howto-asf-mirror.html
 --><document>
     <body>
         <section name="How to download">
-            
             <p>
                 Use the links below to download a distribution of Apache MyFaces from
                 one of our mirrors. It is good practice to verify the integrity of the
                 distribution files.
             </p>
-
             <p>
                 Apache MyFaces is distributed as a <code>zip</code> archive (for Windows) and
                 as a <code>tar.gz</code> archive (for UNIX). The contents are the same. Please note
@@ -39,29 +37,26 @@
             </p>
         </section>
         <section name="Current release (closest mirror site selected automatically)">
-            
             <p>
                 You are currently using <b>[preferred]</b>. If you encounter a
                 problem with this mirror, then please select another.  If all
                 mirrors are failing, there are backup mirrors at the end of the list.
                 See <a href="http://www.apache.org/mirrors/">status</a> of mirrors.
             </p>
-
             <form action="[location]" method="get" id="SelectMirror">
                 Other mirrors: <select name="Preferred">
-                    <!--[if-any http] [for http]-->
-                    <option value="[http]">[http]</option>
-                    <!--[end] [end]-->
-                    <!--[if-any ftp] [for ftp]-->
-                    <option value="[ftp]">[ftp]</option>
-                    <!--[end] [end]-->
-                    <!--[if-any backup] [for backup]-->
-                    <option value="[backup]">[backup] (backup)</option>
-                    <!--[end] [end]-->
-                </select>
+                <!--[if-any http] [for http]-->
+                <option value="[http]">[http]</option>
+                <!--[end] [end]-->
+                <!--[if-any ftp] [for ftp]-->
+                <option value="[ftp]">[ftp]</option>
+                <!--[end] [end]-->
+                <!--[if-any backup] [for backup]-->
+                <option value="[backup]">[backup] (backup)</option>
+                <!--[end] [end]-->
+            </select>
                 <input type="submit" value="Change"/>
             </form>
-
             <p>The current release is Apache MyFaces 1.1.1 (see the
                 <a href="RELEASE-NOTES-1.1.1.txt">release notes</a>).
             </p>
@@ -79,7 +74,6 @@
                     <li>[<a href="http://www.apache.org/dist/myfaces/binaries/myfaces-1.1.1.zip.md5">MD5</a>]</li>
                 </ul>
             </ul>
-
             <p>A binary distribution of the standalone tomahawk components (which work with any JSF implementation) is available.</p>
             <ul>
                 <li>For UNIX operating systems:</li>
@@ -95,7 +89,6 @@
                     <li>[<a href="http://www.apache.org/dist/myfaces/binaries/tomahawk-1.1.1.zip.md5">MD5</a>]</li>
                 </ul>
             </ul>
-
             <p>There is also a binary distribution of the various webapp examples available.</p>
             <ul>
                 <li>For UNIX operating systems:</li>
@@ -111,11 +104,8 @@
                     <li>[<a href="http://www.apache.org/dist/myfaces/binaries/myfaces-1.1.1-examples.zip.md5">MD5</a>]</li>
                 </ul>
             </ul>
-
         </section>
         <section name="Latest source code and nightly builds from SVN repository">
-            
-
             <p>
                 If you want to use the latest Apache MyFaces features, the source code is under
                 version control with SVN.  Click <a href="http://apache.org/dev/version-control.html">here</a>
@@ -133,14 +123,12 @@
             </p>
         </section>
         <section name="Verify releases">
-            
             <p>
                 It is essential that you verify the integrity of the downloaded
                 files using the PGP and MD5 signatures.  MD5 verification ensures the
                 file was not corrupted during the download process.  PGP verification
                 ensures that the file came from a certain person.
             </p>
-
             <p>
                 The PGP signatures can be verified using
                 <a href="http://www.pgpi.org/">PGP</a> or
@@ -152,20 +140,19 @@
                 trusted source - the main ASF distribution site, rather than from a mirror.
                 Then verify the signatures using ...
             </p>
-
             <source>
-            % pgpk -a KEYS
-            % pgpv myfaces-X.Y.tgz.asc
+                % pgpk -a KEYS
+                % pgpv myfaces-X.Y.tgz.asc
 
-            <em>or</em>
+                <em>or</em>
 
-            % pgp -ka KEYS
-            % pgp myfaces-X.Y.tgz.asc
+                % pgp -ka KEYS
+                % pgp myfaces-X.Y.tgz.asc
 
-            <em>or</em>
+                <em>or</em>
 
-            % gpg --import KEYS
-            % gpg --verify myfaces-X.Y.tgz.asc
+                % gpg --import KEYS
+                % gpg --verify myfaces-X.Y.tgz.asc
             </source>
 
             <p>
@@ -173,7 +160,7 @@
                 called <code>md5</code> or <code>md5sum</code>, which is
                 included in many unix distributions.  It is also available as part of
                 <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
-                Textutils</a>.  Windows users can get binary md5 programs from
+                    Textutils</a>.  Windows users can get binary md5 programs from
                 <a href="http://www.fourmilab.ch/md5/">here</a>,
                 <a href="http://www.pc-tools.net/win32/freeware/console/">here</a>, or
                 <a href="http://www.slavasoft.com/fsum/">here</a>.

Modified: myfaces/site/trunk/src/site/xdoc/buildhowto.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/buildhowto.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/buildhowto.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/buildhowto.xml Tue Aug 14 15:09:03 2007
@@ -15,95 +15,84 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="Overview">
-    
-    <p>
-        MyFaces uses Ant to build from the source.  Click <a href="http://ant.apache.org">here</a> for more information on
-        Apache Ant.  These instructions also assume you have already checked out the source code.  If you have not done this, please
-        see the SVN instructions <a href="svn.html">here</a>.
-    </p>
-    <p>
-        There are two ways to build MyFaces.  The first is from the "top level" build directory which is used to build "all" of the
-        subprojects in the correct order.  The other method is to build one or more subprojects directly.
-    </p>
-</section>
-<section name="&quot;One Build To Rule Them All&quot;">
-    
-    <p>
-        MyFaces uses a single build file to build all of the subprojects.  This build file is available in all of the subprojects
-        and is shared through the magic of svn:externals. If you are interested in building everything then you want to execute
-        the build from the "top level" build directory. <em>This is the build directory immediately under the directory you check
-        out the <code>current</code> SVN code to.</em>
-    </p>
-    <p>
-        Most of the targets in the build script have an "all" version that can be used to build all of the subprojects:
-        <code>clean-all, javadoc-all, dist-all </code> etc.
-
-    </p>
-    <source xml:space="preserve">
-        svn co https://svn.apache.org/repos/asf/myfaces/current myfaces-current
-        cd myfaces-current/build
-        ant download-dependencies dist-all
-    </source>
-    <p>
-        You can also build the subprojects individually by using the build file contained in the relevant subproject's build directory.
-        There are some restrictions on this, however, as not all of the subprojects can be built independently.  For certain subprojects,
-        the order is important.
-    </p>
-    <p>
-        Example: You want to build myfaces-impl.jar.  This requires the API to compile so you would need to build the API subproject first.
-    </p>
-    <source xml:space="preserve">
-        svn co https://svn.apache.org/repos/asf/myfaces/current myfaces-current
-        cd myfaces-cuurent/api/build
-        ant download-dependencies
-        ant dist
-        cd ../../
-        cd impl
-        ant dist
-    </source>
-
-</section>
-<section name="Dependencies">
-    
-    <p>
-        There are several third party JAR files that MyFaces depends on (for a complete list see the comments in the build.xml file.)
-        The simplest way to obtain these jar files is to run <code>ant download-dependencies</code> from the top level build directory.
-        This will create a lib directory that will automatically be used by the Ant script when building.  Normally this is a one-time
-        step but you may want to occassionally run this target to make sure the dependencies have not changed (especially if you
-        are unable to build all of a sudden.)
-    </p>
-    <p>
-        It is not required that you use the <code>download-dependencies</code> target.  The <code>build.default.properties</code> file
-        contains a list of the jar file dependencies.  By default it points to the top level lib directory.  So to use your own local
-        JAR files you have three options:
-    </p>
-    <ul>
-        <li>
-            Create a top level lib directory and copy your jars into it (editing the <code>build.default.properties</code> file if
-            necessary.)
-        </li>
-        <li>
-            Create/edit the <code>build.properties</code> file in your home directory so that each entry in <code>
-            build.default.properties</code> file is accounted for and points to the appropriate location on your machine.
-        </li>
-        <li>
-            Create/edit the <code>build.local.properties</code> file in your build directory so that each entry in <code>
-            build.default.properties</code> file is accounted for and points to the appropriate location on your machine.
-        </li>
-    </ul>
-</section>
-
-
-</body>
-
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="Overview">
+            <p>
+                MyFaces uses Ant to build from the source.  Click <a href="http://ant.apache.org">here</a> for more information on
+                Apache Ant.  These instructions also assume you have already checked out the source code.  If you have not done this, please
+                see the SVN instructions <a href="svn.html">here</a>.
+            </p>
+            <p>
+                There are two ways to build MyFaces.  The first is from the "top level" build directory which is used to build "all" of the
+                subprojects in the correct order.  The other method is to build one or more subprojects directly.
+            </p>
+        </section>
+        <section name="&quot;One Build To Rule Them All&quot;">
+            <p>
+                MyFaces uses a single build file to build all of the subprojects.  This build file is available in all of the subprojects
+                and is shared through the magic of svn:externals. If you are interested in building everything then you want to execute
+                the build from the "top level" build directory. <em>This is the build directory immediately under the directory you check
+                out the <code>current</code> SVN code to.</em>
+            </p>
+            <p>
+                Most of the targets in the build script have an "all" version that can be used to build all of the subprojects:
+                <code>clean-all, javadoc-all, dist-all </code> etc.
+
+            </p>
+            <source xml:space="preserve">
+                svn co https://svn.apache.org/repos/asf/myfaces/current myfaces-current
+                cd myfaces-current/build
+                ant download-dependencies dist-all
+            </source>
+            <p>
+                You can also build the subprojects individually by using the build file contained in the relevant subproject's build directory.
+                There are some restrictions on this, however, as not all of the subprojects can be built independently.  For certain subprojects,
+                the order is important.
+            </p>
+            <p>
+                Example: You want to build myfaces-impl.jar.  This requires the API to compile so you would need to build the API subproject first.
+            </p>
+            <source xml:space="preserve">
+                svn co https://svn.apache.org/repos/asf/myfaces/current myfaces-current
+                cd myfaces-cuurent/api/build
+                ant download-dependencies
+                ant dist
+                cd ../../
+                cd impl
+                ant dist
+            </source>
+        </section>
+        <section name="Dependencies">
+            <p>
+                There are several third party JAR files that MyFaces depends on (for a complete list see the comments in the build.xml file.)
+                The simplest way to obtain these jar files is to run <code>ant download-dependencies</code> from the top level build directory.
+                This will create a lib directory that will automatically be used by the Ant script when building.  Normally this is a one-time
+                step but you may want to occassionally run this target to make sure the dependencies have not changed (especially if you
+                are unable to build all of a sudden.)
+            </p>
+            <p>
+                It is not required that you use the <code>download-dependencies</code> target.  The <code>build.default.properties</code> file
+                contains a list of the jar file dependencies.  By default it points to the top level lib directory.  So to use your own local
+                JAR files you have three options:
+            </p>
+            <ul>
+                <li>
+                    Create a top level lib directory and copy your jars into it (editing the <code>build.default.properties</code> file if
+                    necessary.)
+                </li>
+                <li>
+                    Create/edit the <code>build.properties</code> file in your home directory so that each entry in <code>
+                    build.default.properties</code> file is accounted for and points to the appropriate location on your machine.
+                </li>
+                <li>
+                    Create/edit the <code>build.local.properties</code> file in your build directory so that each entry in <code>
+                    build.default.properties</code> file is accounted for and points to the appropriate location on your machine.
+                </li>
+            </ul>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/cardemoweb.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/cardemoweb.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/cardemoweb.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/cardemoweb.xml Tue Aug 14 15:09:03 2007
@@ -15,89 +15,82 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="Cardemo web.xml">
-    
-  
-	<source xml:space="preserve">&lt;?xml version='1.0' encoding='UTF-8'?&gt;
-
-&lt;!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
-
-&lt;web-app&gt;
-
-   &lt;display-name&gt;Car Store&lt;/display-name&gt;
-   &lt;description&gt;Buy a car.&lt;/description&gt;
-
-   &lt;context-param&gt;
-       &lt;param-name&gt;javax.faces.application.CONFIG_FILES&lt;/param-name&gt;
-       &lt;param-value&gt;
-       &lt;/param-value&gt;
-       &lt;description&gt;
-           Comma separated list of URIs of additional faces config files.
-           (e.g. /WEB-INF/my-config.xml) Attention: /WEB-INF/faces.config.xml is added automatically.
-           See JSF 1.0 PRD2, 10.3.2
-       &lt;/description&gt;
-   &lt;/context-param&gt;
-
-   &lt;context-param&gt;
-       &lt;param-name&gt;javax.faces.STATE_SAVING_METHOD&lt;/param-name&gt;
-       &lt;param-value&gt;server&lt;/param-value&gt;
-   &lt;/context-param&gt;
-
-   &lt;context-param&gt;
-       &lt;param-name&gt;myfaces_allow_javascript&lt;/param-name&gt;
-       &lt;param-value&gt;true&lt;/param-value&gt;
-       &lt;description&gt;
-           This parameter tells MyFaces if javascript code should be allowed in the
-           rendered HTML output.
-           If javascript is allowed, command_link anchors will have javascript code
-           that submits the corresponding form.
-           If javascript is not allowed, the state saving info and nested parameters
-           will be added as url parameters.
-           Default: "true"
-       &lt;/description&gt;
-   &lt;/context-param&gt;
-
-   &lt;context-param&gt;
-       &lt;param-name&gt;myfaces_pretty_html&lt;/param-name&gt;
-       &lt;param-value&gt;true&lt;/param-value&gt;
-       &lt;description&gt;
-           If true, rendered HTML code will be formatted, so that it is "human readable".
-           i.e. additional line separators and whitespace will be written, that do not
-           influence the HTML code.
-           Default: "true"
-       &lt;/description&gt;
-   &lt;/context-param&gt;
-
-
-   &lt;!-- Faces Servlet --&gt;
-   &lt;servlet&gt;
-       &lt;servlet-name&gt;Faces Servlet&lt;/servlet-name&gt;
-       &lt;servlet-class&gt;javax.faces.webapp.FacesServlet&lt;/servlet-class&gt;
-       &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-   &lt;/servlet&gt;
-
-
-   &lt;!-- Faces Servlet Mapping --&gt;
-   &lt;servlet-mapping&gt;
-       &lt;servlet-name&gt;Faces Servlet&lt;/servlet-name&gt;
-       &lt;url-pattern&gt;*.faces&lt;/url-pattern&gt;
-   &lt;/servlet-mapping&gt;
-
-
-&lt;/web-app&gt; </source>
-
-	</section>
-</body>
-    
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
+
+<document>
+    <body>
+        <section name="Cardemo web.xml">
+            <source xml:space="preserve">&lt;?xml version='1.0' encoding='UTF-8'?&gt;
+
+                &lt;!DOCTYPE web-app PUBLIC
+                "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+                "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
+
+                &lt;web-app&gt;
+
+                &lt;display-name&gt;Car Store&lt;/display-name&gt;
+                &lt;description&gt;Buy a car.&lt;/description&gt;
+
+                &lt;context-param&gt;
+                &lt;param-name&gt;javax.faces.application.CONFIG_FILES&lt;/param-name&gt;
+                &lt;param-value&gt;
+                &lt;/param-value&gt;
+                &lt;description&gt;
+                Comma separated list of URIs of additional faces config files.
+                (e.g. /WEB-INF/my-config.xml) Attention: /WEB-INF/faces.config.xml is added automatically.
+                See JSF 1.0 PRD2, 10.3.2
+                &lt;/description&gt;
+                &lt;/context-param&gt;
+
+                &lt;context-param&gt;
+                &lt;param-name&gt;javax.faces.STATE_SAVING_METHOD&lt;/param-name&gt;
+                &lt;param-value&gt;server&lt;/param-value&gt;
+                &lt;/context-param&gt;
+
+                &lt;context-param&gt;
+                &lt;param-name&gt;myfaces_allow_javascript&lt;/param-name&gt;
+                &lt;param-value&gt;true&lt;/param-value&gt;
+                &lt;description&gt;
+                This parameter tells MyFaces if javascript code should be allowed in the
+                rendered HTML output.
+                If javascript is allowed, command_link anchors will have javascript code
+                that submits the corresponding form.
+                If javascript is not allowed, the state saving info and nested parameters
+                will be added as url parameters.
+                Default: "true"
+                &lt;/description&gt;
+                &lt;/context-param&gt;
+
+                &lt;context-param&gt;
+                &lt;param-name&gt;myfaces_pretty_html&lt;/param-name&gt;
+                &lt;param-value&gt;true&lt;/param-value&gt;
+                &lt;description&gt;
+                If true, rendered HTML code will be formatted, so that it is "human readable".
+                i.e. additional line separators and whitespace will be written, that do not
+                influence the HTML code.
+                Default: "true"
+                &lt;/description&gt;
+                &lt;/context-param&gt;
+
+
+                &lt;!-- Faces Servlet --&gt;
+                &lt;servlet&gt;
+                &lt;servlet-name&gt;Faces Servlet&lt;/servlet-name&gt;
+                &lt;servlet-class&gt;javax.faces.webapp.FacesServlet&lt;/servlet-class&gt;
+                &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+                &lt;/servlet&gt;
+
+
+                &lt;!-- Faces Servlet Mapping --&gt;
+                &lt;servlet-mapping&gt;
+                &lt;servlet-name&gt;Faces Servlet&lt;/servlet-name&gt;
+                &lt;url-pattern&gt;*.faces&lt;/url-pattern&gt;
+                &lt;/servlet-mapping&gt;
+
+
+                &lt;/web-app&gt; </source>
+
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/community/javaone2005.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/community/javaone2005.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/community/javaone2005.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/community/javaone2005.xml Tue Aug 14 15:09:03 2007
@@ -15,24 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
+
+<document>
     <body>
         <section name="MyFaces Presentation at the Oracle Theater">
-            
             <p>Manfred, Martin, and Thomas presented Apache MyFaces at the Oracle Theater.<br/>
-               See the <a href="javaone2005_session.html">pictures</a>!</p>
+                See the <a href="javaone2005_session.html">pictures</a>!</p>
         </section>
         <section name="MyFaces ComeTogether">
-            
             <p>On Wednesday a number of MyFaces developers came together and enjoyed an interesting and funny evening.<br/>
-               (Thanks to Jonas Jacobi for organising!)<br/>
-               See the <a href="javaone2005_cometogether.html">pictures</a>!</p>
+                (Thanks to Jonas Jacobi for organising!)<br/>
+                See the <a href="javaone2005_cometogether.html">pictures</a>!</p>
         </section>
     </body>
-    
-
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/community/javaone2005_cometogether.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/community/javaone2005_cometogether.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/community/javaone2005_cometogether.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/community/javaone2005_cometogether.xml Tue Aug 14 15:09:03 2007
@@ -15,47 +15,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
     <body>
-            <p><img src="../images/javaone2005/cometogether/CIMG0325.jpg" alt=""/><br/>
-                Adam Winer (front), ..., Marc Rabil, Kalle Korhonen (rightmost)
-            </p>
-            <p><img src="../images/javaone2005/cometogether/CIMG0326.jpg" alt=""/><br/>
-                John Fallows, Martin Marinschek, Glen Foster
-            </p>
-            <p><img src="../images/javaone2005/cometogether/CIMG0328.jpg" alt=""/><br/>
-                Adam Winer (leftmost), ..., John Fallows (rightmost)
-            </p>
-            <p><img src="../images/javaone2005/cometogether/CIMG0329.jpg" alt=""/><br/>
-                Anton Koinov, Manfred Geiler, ..., Stan Silvert (rightmost)
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0798.jpg" alt=""/><br/>
-                Jonas Jacobi, Martin Cooper
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0799.jpg" alt=""/><br/>
-                Adam Winer already knows everything about JavaServer Faces... ;-)
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0800.jpg" alt=""/><br/>
-                Thomas Spiegl, Howard Abrams
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0801.jpg" alt=""/><br/>
-                Brian Albers, Anton Koinov
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0802.jpg" alt=""/><br/>
-                Marc Rabil, Kalle Korhonen, John Fallows
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0803.jpg" alt=""/><br/>
-                Kalle Korhonen, John Fallows, Martin Marinschek, Marc Stockhammer, ..., Jonas Jacobi
-            </p>
-            <p><img src="../images/javaone2005/cometogether/IMG_0804.jpg" alt=""/><br/>
-                Anton Koinov, Manfred Geiler
-            </p>
+        <p><img src="../images/javaone2005/cometogether/CIMG0325.jpg" alt=""/><br/>
+            Adam Winer (front), ..., Marc Rabil, Kalle Korhonen (rightmost)
+        </p>
+        <p><img src="../images/javaone2005/cometogether/CIMG0326.jpg" alt=""/><br/>
+            John Fallows, Martin Marinschek, Glen Foster
+        </p>
+        <p><img src="../images/javaone2005/cometogether/CIMG0328.jpg" alt=""/><br/>
+            Adam Winer (leftmost), ..., John Fallows (rightmost)
+        </p>
+        <p><img src="../images/javaone2005/cometogether/CIMG0329.jpg" alt=""/><br/>
+            Anton Koinov, Manfred Geiler, ..., Stan Silvert (rightmost)
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0798.jpg" alt=""/><br/>
+            Jonas Jacobi, Martin Cooper
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0799.jpg" alt=""/><br/>
+            Adam Winer already knows everything about JavaServer Faces... ;-)
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0800.jpg" alt=""/><br/>
+            Thomas Spiegl, Howard Abrams
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0801.jpg" alt=""/><br/>
+            Brian Albers, Anton Koinov
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0802.jpg" alt=""/><br/>
+            Marc Rabil, Kalle Korhonen, John Fallows
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0803.jpg" alt=""/><br/>
+            Kalle Korhonen, John Fallows, Martin Marinschek, Marc Stockhammer, ..., Jonas Jacobi
+        </p>
+        <p><img src="../images/javaone2005/cometogether/IMG_0804.jpg" alt=""/><br/>
+            Anton Koinov, Manfred Geiler
+        </p>
     </body>
-    
-
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/community/javaone2005_session.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/community/javaone2005_session.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/community/javaone2005_session.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/community/javaone2005_session.xml Tue Aug 14 15:09:03 2007
@@ -15,21 +15,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
+
+<document>
     <body>
-            <p><img src="../images/javaone2005/session/CIMG0314.jpg" alt="MyFaces Presentation at the Oracle Theater"/><br/>
-               MyFaces Presentation at the Oracle Theater</p>
-            <p><img src="../images/javaone2005/session/CIMG0298.jpg" alt="Thomas Spiegl"/><br/>
-               Thomas Spiegl</p>
-            <p><img src="../images/javaone2005/session/CIMG0306.jpg" alt="Manfred Geiler"/><br/>
-                Manfred Geiler</p>
-            <p><img src="../images/javaone2005/session/CIMG0311.jpg" alt="Martin Marinschek"/><br/>
-                Martin Marinschek</p>
+        <p><img src="../images/javaone2005/session/CIMG0314.jpg" alt="MyFaces Presentation at the Oracle Theater"/><br/>
+            MyFaces Presentation at the Oracle Theater</p>
+        <p><img src="../images/javaone2005/session/CIMG0298.jpg" alt="Thomas Spiegl"/><br/>
+            Thomas Spiegl</p>
+        <p><img src="../images/javaone2005/session/CIMG0306.jpg" alt="Manfred Geiler"/><br/>
+            Manfred Geiler</p>
+        <p><img src="../images/javaone2005/session/CIMG0311.jpg" alt="Martin Marinschek"/><br/>
+            Martin Marinschek</p>
     </body>
-    
-
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/community/poweredbymyfaces.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/community/poweredbymyfaces.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/community/poweredbymyfaces.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/community/poweredbymyfaces.xml Tue Aug 14 15:09:03 2007
@@ -15,25 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="Have you used MyFaces successfully?">
-
-      <p>Add the logo to your page and link to us!
-		  <br/>
-		  <img src="images/poweredby_myface.gif" alt="Powered by MyFaces"/>
-	  </p>
-</section>
-
-
-
-</body>
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="Have you used MyFaces successfully?">
+            <p>Add the logo to your page and link to us!
+                <br/>
+                <img src="images/poweredby_myface.gif" alt="Powered by MyFaces"/>
+            </p>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/compatibility.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/compatibility.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/compatibility.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/compatibility.xml Tue Aug 14 15:09:03 2007
@@ -15,141 +15,133 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-<document>
-  <properties>  
-    <title>Compatibility</title>
-   </properties>
-
-<body>
 
-<section name="Project and Environment Matrix">
-  <p>
-The table below is provides an overview of the MyFaces projects relative to their environments.  You should
-refer to each project's own documentation for more specific information.
-  </p>
-  <table>
-    <tr>
-      <th>Project\Environment</th>
-      <th>Java 1.4</th>
-      <th>Java 5</th>
-      <th>Java 6</th>
-      <th>JSF 1.1.x</th>
-      <th>JSF 1.2.x</th>
-      <th>Servlet 2.4</th>
-      <th>Servlet 2.5</th>
-    </tr>
-    <tr>
-      <th><a href="impl/index.html">MyFaces 1.1.x</a></th>
-      <td>Y</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Implements</td>
-      <td>N</td>
-      <td>Y</td>
-      <td>-</td>
-    </tr>
-    <tr>
-      <th>MyFaces 1.2.x</th>
-      <td>N</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>N</td>
-      <td>Implements</td>
-      <td>N</td>
-      <td>Y</td>
-    </tr>
-    <tr>
-      <th><a href="tomahawk/index.html">Tomahawk</a></th>
-      <td>Y</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-    </tr>
-    <tr>
-      <th><a href="tobago/index.html">Tobago</a></th>
-      <td>N</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-    </tr>
-    <tr>
-      <th>Trinidad 1.0.x</th>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-    </tr>
-    <tr>
-      <th>Trinidad 1.2.x</th>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>-</td>
-      <td>Y</td>
-      <td>-</td>
-      <td>Y</td>
-    </tr>
-    <tr>
-      <th>Orchestra</th>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-      <td>-</td>
-    </tr>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
-  </table>
-</section>
-<section name="MyFaces is known to work with and was tested in the following environments:">
-	
-	<ol>
-		<li>Java</li>
-		<ol>
-			<li>JDK 1.4.x</li>
-			<li>JDK 1.5.x</li>
-		</ol>
-		<li>Servlet Container</li>
-		<ol>
-			<li>Tomcat 4.x</li>
-			<li>Tomcat 5.x</li>
-			<li>JRun 4 (SP1a)</li>
-			<li>JBoss 3.2.x</li>
-			<li>JBoss 4.0.x</li>
-			<li>BEA Weblogic 8.1</li>
-			<li>Jonas 3.3.6 w/ Tomcat</li>
-			<li>Resin 2.1.x</li>
-			<li>Jetty 4.2.x</li>
-			<li>Jetty 5.1.x</li>
-			<li>Websphere 5.1.2</li>
-			<li>OC4J</li>
-		</ol>
-		<li>Custom JSF components</li>
-		<ol>
-			<li>ADF Faces of Oracle</li>
-		</ol>
-	</ol>
-</section>
-<section name="We encourage you to try other environments as well.">
-	
-	<p>Please give us as much feedback as possible! </p>
-</section>
-
-</body>
-    
-    
+<document>
+    <properties>
+        <title>Compatibility</title>
+    </properties>
+    <body>
+        <section name="Project and Environment Matrix">
+            <p>
+                The table below is provides an overview of the MyFaces projects relative to their environments.  You should
+                refer to each project's own documentation for more specific information.
+            </p>
+            <table>
+                <tr>
+                    <th>Project\Environment</th>
+                    <th>Java 1.4</th>
+                    <th>Java 5</th>
+                    <th>Java 6</th>
+                    <th>JSF 1.1.x</th>
+                    <th>JSF 1.2.x</th>
+                    <th>Servlet 2.4</th>
+                    <th>Servlet 2.5</th>
+                </tr>
+                <tr>
+                    <th><a href="impl/index.html">MyFaces 1.1.x</a></th>
+                    <td>Y</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Implements</td>
+                    <td>N</td>
+                    <td>Y</td>
+                    <td>-</td>
+                </tr>
+                <tr>
+                    <th>MyFaces 1.2.x</th>
+                    <td>N</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>N</td>
+                    <td>Implements</td>
+                    <td>N</td>
+                    <td>Y</td>
+                </tr>
+                <tr>
+                    <th><a href="tomahawk/index.html">Tomahawk</a></th>
+                    <td>Y</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                </tr>
+                <tr>
+                    <th><a href="tobago/index.html">Tobago</a></th>
+                    <td>N</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                </tr>
+                <tr>
+                    <th>Trinidad 1.0.x</th>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                </tr>
+                <tr>
+                    <th>Trinidad 1.2.x</th>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>Y</td>
+                    <td>-</td>
+                    <td>Y</td>
+                </tr>
+                <tr>
+                    <th>Orchestra</th>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>-</td>
+                    <td>-</td>
+                </tr>
 
+            </table>
+        </section>
+        <section name="MyFaces is known to work with and was tested in the following environments:">
+            <ol>
+                <li>Java</li>
+                <ol>
+                    <li>JDK 1.4.x</li>
+                    <li>JDK 1.5.x</li>
+                </ol>
+                <li>Servlet Container</li>
+                <ol>
+                    <li>Tomcat 4.x</li>
+                    <li>Tomcat 5.x</li>
+                    <li>JRun 4 (SP1a)</li>
+                    <li>JBoss 3.2.x</li>
+                    <li>JBoss 4.0.x</li>
+                    <li>BEA Weblogic 8.1</li>
+                    <li>Jonas 3.3.6 w/ Tomcat</li>
+                    <li>Resin 2.1.x</li>
+                    <li>Jetty 4.2.x</li>
+                    <li>Jetty 5.1.x</li>
+                    <li>Websphere 5.1.2</li>
+                    <li>OC4J</li>
+                </ol>
+                <li>Custom JSF components</li>
+                <ol>
+                    <li>ADF Faces of Oracle</li>
+                </ol>
+            </ol>
+        </section>
+        <section name="We encourage you to try other environments as well.">
+            <p>Please give us as much feedback as possible! </p>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/bootstrap.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/bootstrap.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/bootstrap.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/bootstrap.xml Tue Aug 14 15:09:03 2007
@@ -15,113 +15,102 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-<body>
-
-<section name="Bootstrap build">
-
-
-    <p>
-        The following instructions are for the setup and usage of the bootstrap.xml build file.  This file is an Ant script
-        which can be used to generate and publish the nightly builds using the latest SVN code.  It is also used to build
-        and sign the release builds.  Finally, this file is used to automatically generate the website using the latest
-        xdocs, javadoc and tlddoc from SVN.
-    </p>
-    <ul>
-        <li>
-            Install
-            <a href="http://ant.apache.org">Ant</a>.
-            Make sure the ant binary is part of the <code>$PATH</code>.
-        </li>
-    </ul>
-    <ul>
-        <li>
-            Download the jsch.jar from
-            <a href="http://www.jcraft.com/jsch">jcraft</a>
-            and copy to <code>$ANT_HOME/lib</code>.  This is necessary to allow scp to the destination server.
-        </li>
-    </ul>
-    <ul>
-        <li>
-            Download the jsvn.jar from
-            <a href="http://jsvn.alternatecomputing.com/">alternatecomputing.com</a>
-            and copy to <code>$ANT_HOME/lib</code>.  This is necessary to allow ant to use SVN to retrieve the source code.
-        </li>
-    </ul>
-
-
-
-    <ul>
-        <li>
-            Install
-            <a href="http://subversion.tigris.org/">SVN</a>.
-            Make sure the svn binary is part of the <code>$PATH</code>.
-        </li>
-    </ul>
-    <ul>
-        <li>
-            Create a directory for creating the nightly/release builds.
-        </li>
-    </ul>
-    <ul>
-        <li>
-            Copy the <code>bootstrap.xml</code> file and <code>bootstrap.properties</code> files to this directory.
-            These files should work without any changes.  Currently these files are located in the SVN repository in
-            the <code>build</code> directory.  Copy the <code>bootstrap.properties.local.sample</code>
-            file to this directory as well.  Rename this file to <code>bootstrap.properties.local</code>.  Change the
-            username and password in this file to a valid username and password for the destination server.
-        </li>
-    </ul>
-    <ul>
-        <li>
-            You can perform the nightly build manually from the command line using: <br/>
-            <code>ant -buildfile bootstrap.xml clean nightly</code>
-        </li>
-    </ul>
-    <ul>
-        <li>
-            You can perform the release build manually from the command line using: <br/>
-            <code>ant -buildfile bootstrap.xml -Dbuild.version=1_0_9 clean nightly</code>
-            <blockquote><h3>NOTE</h3>
-                The release target requires that the source be tagged as rel_x where build.version = x.  You should also
-                update the manifest.properties in the build directory before checking out.  The value of manifest.impl.version
-                will be used in the bundle filenames.  (Ex. <code>manifest.impl.version=1.0.9</code> yields a filename of
-                <code>myfaces-1.0.9.tgz</code>)
-            </blockquote>
-        </li>
-    </ul>
-    <ul>
-        <li>
-            A cron job similar to the following should be used on the destination server to purge files older than five days <br/>
-            <code>03 04 * * * find /www/people.apache.org/builds/myfaces/nightly -mtime +5 -exec rm {\} \; &gt;/dev/null 2&gt;&amp;1</code>
-        </li>
-    </ul>
-    <ul>
-        <li>
-            A cron job also needs to be added to the machine performing the nightly build <br/>
-            <code>00 23 * * * ant -buildfile /home/sjs4/bootstrap/bootstrap.xml -logger org.apache.tools.ant.listener.MailLogger -quiet clean nightly &gt;/dev/null 2&gt;&amp;1</code>
-        </li>
-    </ul>
-    <ul>
-        <li>
-            A cron job also needs to be added to the machine performing the preiodic website build <br/>
-            <code>45 0-23/4 * * * ant -buildfile /home/sjs4/bootstrap/bootstrap.xml -logger org.apache.tools.ant.listener.MailLogger clean publish-site &gt;/dev/null</code>
-        </li>
-    </ul>
-    <ul>
-        <li>
-            A cron job is also needed on the desitnation server to make sure the website is updated from SVN <br/>
-            <code>15 * * * * /home/schof/site-update.sh &gt;/dev/null</code>
-        </li>
-    </ul>
-
-</section>
-
-</body>
-
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="Bootstrap build">
+            <p>
+                The following instructions are for the setup and usage of the bootstrap.xml build file.  This file is an Ant script
+                which can be used to generate and publish the nightly builds using the latest SVN code.  It is also used to build
+                and sign the release builds.  Finally, this file is used to automatically generate the website using the latest
+                xdocs, javadoc and tlddoc from SVN.
+            </p>
+            <ul>
+                <li>
+                    Install
+                    <a href="http://ant.apache.org">Ant</a>.
+                    Make sure the ant binary is part of the <code>$PATH</code>.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    Download the jsch.jar from
+                    <a href="http://www.jcraft.com/jsch">jcraft</a>
+                    and copy to <code>$ANT_HOME/lib</code>.  This is necessary to allow scp to the destination server.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    Download the jsvn.jar from
+                    <a href="http://jsvn.alternatecomputing.com/">alternatecomputing.com</a>
+                    and copy to <code>$ANT_HOME/lib</code>.  This is necessary to allow ant to use SVN to retrieve the source code.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    Install
+                    <a href="http://subversion.tigris.org/">SVN</a>.
+                    Make sure the svn binary is part of the <code>$PATH</code>.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    Create a directory for creating the nightly/release builds.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    Copy the <code>bootstrap.xml</code> file and <code>bootstrap.properties</code> files to this directory.
+                    These files should work without any changes.  Currently these files are located in the SVN repository in
+                    the <code>build</code> directory.  Copy the <code>bootstrap.properties.local.sample</code>
+                    file to this directory as well.  Rename this file to <code>bootstrap.properties.local</code>.  Change the
+                    username and password in this file to a valid username and password for the destination server.
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    You can perform the nightly build manually from the command line using: <br/>
+                    <code>ant -buildfile bootstrap.xml clean nightly</code>
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    You can perform the release build manually from the command line using: <br/>
+                    <code>ant -buildfile bootstrap.xml -Dbuild.version=1_0_9 clean nightly</code>
+                    <blockquote><h3>NOTE</h3>
+                        The release target requires that the source be tagged as rel_x where build.version = x.  You should also
+                        update the manifest.properties in the build directory before checking out.  The value of manifest.impl.version
+                        will be used in the bundle filenames.  (Ex. <code>manifest.impl.version=1.0.9</code> yields a filename of
+                        <code>myfaces-1.0.9.tgz</code>)
+                    </blockquote>
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    A cron job similar to the following should be used on the destination server to purge files older than five days <br/>
+                    <code>03 04 * * * find /www/people.apache.org/builds/myfaces/nightly -mtime +5 -exec rm {\} \; &gt;/dev/null 2&gt;&amp;1</code>
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    A cron job also needs to be added to the machine performing the nightly build <br/>
+                    <code>00 23 * * * ant -buildfile /home/sjs4/bootstrap/bootstrap.xml -logger org.apache.tools.ant.listener.MailLogger -quiet clean nightly &gt;/dev/null 2&gt;&amp;1</code>
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    A cron job also needs to be added to the machine performing the preiodic website build <br/>
+                    <code>45 0-23/4 * * * ant -buildfile /home/sjs4/bootstrap/bootstrap.xml -logger org.apache.tools.ant.listener.MailLogger clean publish-site &gt;/dev/null</code>
+                </li>
+            </ul>
+            <ul>
+                <li>
+                    A cron job is also needed on the desitnation server to make sure the website is updated from SVN <br/>
+                    <code>15 * * * * /home/schof/site-update.sh &gt;/dev/null</code>
+                </li>
+            </ul>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/jars.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/jars.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/jars.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/jars.xml Tue Aug 14 15:09:03 2007
@@ -15,151 +15,145 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
 
-<body>
-	<section name="JAR-Files inside of Apache MyFaces">
-		
-		<table>
-			<tr>
-				<td colspan="1" rowspan="1">
-					<strong>lib</strong>
-				</td>
-				<td colspan="1" rowspan="1">
-					<strong>jfsapi</strong>
-				</td>
-				<td colspan="1" rowspan="1">
-					<strong>share</strong>
-				</td>
-				<td colspan="1" rowspan="1">
-					<strong>myfaces(impl)</strong>
-				</td>
-				<td colspan="1" rowspan="1">
-					<strong>components</strong>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">servlet-2.3-jsp-1.2.jar </td>
-				<td colspan="1" rowspan="1">c</td>
-				<td colspan="1" rowspan="1">c</td>
-				<td colspan="1" rowspan="1">c</td>
-				<td colspan="1" rowspan="1">c</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">jstl.jar</td>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">jsp-2.0.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">2</td>
-				<td colspan="1" rowspan="1">2</td>
-				<td colspan="1" rowspan="1">2</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-el.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-logging.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-digester-1.5.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-beanutils-1.6.1.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-codec-1.2.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1"/>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">commons-collections-3.0.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1"/>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">optional/commons-fileupload-1.0.ja</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">optional/commons-validator.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">optional/jakarta-oro.ja</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1">x</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">log4j-1.2.8.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">tlddoc.jar</td>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-				<td colspan="1" rowspan="1"/>
-			</tr>
-		</table>
-	</section>
-	<section name="caption">
-		
-		<table>
-			<tr>
-				<td colspan="1" rowspan="1">C</td>
-				<td colspan="1" rowspan="1">compile-time only</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">2</td>
-				<td colspan="1" rowspan="1">compile-time and run-time for non JSP-2.0 containers</td>
-			</tr>
-			<tr>
-				<td colspan="1" rowspan="1">x</td>
-				<td colspan="1" rowspan="1">compile- and run-time</td>
-			</tr>
-		</table>
-	</section>
-</body>
-
-    
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="JAR-Files inside of Apache MyFaces">
+            <table>
+                <tr>
+                    <td colspan="1" rowspan="1">
+                        <strong>lib</strong>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                        <strong>jfsapi</strong>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                        <strong>share</strong>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                        <strong>myfaces(impl)</strong>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                        <strong>components</strong>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">servlet-2.3-jsp-1.2.jar </td>
+                    <td colspan="1" rowspan="1">c</td>
+                    <td colspan="1" rowspan="1">c</td>
+                    <td colspan="1" rowspan="1">c</td>
+                    <td colspan="1" rowspan="1">c</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">jstl.jar</td>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">jsp-2.0.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">2</td>
+                    <td colspan="1" rowspan="1">2</td>
+                    <td colspan="1" rowspan="1">2</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-el.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-logging.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-digester-1.5.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-beanutils-1.6.1.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-codec-1.2.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1"/>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">commons-collections-3.0.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1"/>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">optional/commons-fileupload-1.0.ja</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">optional/commons-validator.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">optional/jakarta-oro.ja</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1">x</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">log4j-1.2.8.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">tlddoc.jar</td>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                    <td colspan="1" rowspan="1"/>
+                </tr>
+            </table>
+        </section>
+        <section name="caption">
+            <table>
+                <tr>
+                    <td colspan="1" rowspan="1">C</td>
+                    <td colspan="1" rowspan="1">compile-time only</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">2</td>
+                    <td colspan="1" rowspan="1">compile-time and run-time for non JSP-2.0 containers</td>
+                </tr>
+                <tr>
+                    <td colspan="1" rowspan="1">x</td>
+                    <td colspan="1" rowspan="1">compile- and run-time</td>
+                </tr>
+            </table>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/portlet.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/portlet.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/portlet.xml Tue Aug 14 15:09:03 2007
@@ -15,48 +15,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="How to create a JSF Portlet using MyFaces:">
-
-	<ol>
-		<li>Make sure your JSF MyFaces application runs as a stand-alone servlet.</li>
-		<li>Remove any redirects from your faces-config.xml.  Portlets can not handle these.</li>
-		<li>Create a Portlet WAR as per the instructions for your Portlet container.  Make sure it contains everything that was included in step 1.</li>
-		<li>Update your portlet.xml file as follows:</li>
-		</ol>
-		<source xml:space="preserve">
-
-&lt;!-- You must use this Portlet impl class --&gt;
-&lt;portlet-class&gt;org.apache.myfaces.portlet.MyFacesGenericPortlet&lt;/portlet-class&gt;
-
-&lt;!-- The "home page" of your JSF application --&gt;
-&lt;!-- This is a required param.               --&gt;
-&lt;init-param&gt;
-   &lt;name&gt;default-view&lt;/name&gt;
-   &lt;value&gt;/some_view_id_from_faces-config&lt;/value&gt;
-&lt;/init-param&gt;
-
-&lt;!-- A class name that implements org.apache.myfaces.portlet.DefaultViewSelector --&gt;
-&lt;!-- This optional param is used if your want to choose different default views  --&gt;
-&lt;!-- based on some condition.  You still must specify default-view above, but    --&gt;
-&lt;!-- this impl will take precedence.                                             --&gt;
-&lt;init-param&gt;
-   &lt;name&gt;default-view-selector&lt;/name&gt;
-   &lt;value&gt;com.foo.MyViewSelector&lt;/value&gt;
-&lt;/init-param&gt;
-		</source>
-</section>
-
-
-
-</body>
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="How to create a JSF Portlet using MyFaces:">
+            <ol>
+                <li>Make sure your JSF MyFaces application runs as a stand-alone servlet.</li>
+                <li>Remove any redirects from your faces-config.xml.  Portlets can not handle these.</li>
+                <li>Create a Portlet WAR as per the instructions for your Portlet container.  Make sure it contains everything that was included in step 1.</li>
+                <li>Update your portlet.xml file as follows:</li>
+            </ol>
+            <source xml:space="preserve">
+
+                &lt;!-- You must use this Portlet impl class --&gt;
+                &lt;portlet-class&gt;org.apache.myfaces.portlet.MyFacesGenericPortlet&lt;/portlet-class&gt;
+
+                &lt;!-- The "home page" of your JSF application --&gt;
+                &lt;!-- This is a required param.               --&gt;
+                &lt;init-param&gt;
+                &lt;name&gt;default-view&lt;/name&gt;
+                &lt;value&gt;/some_view_id_from_faces-config&lt;/value&gt;
+                &lt;/init-param&gt;
+
+                &lt;!-- A class name that implements org.apache.myfaces.portlet.DefaultViewSelector --&gt;
+                &lt;!-- This optional param is used if your want to choose different default views  --&gt;
+                &lt;!-- based on some condition.  You still must specify default-view above, but    --&gt;
+                &lt;!-- this impl will take precedence.                                             --&gt;
+                &lt;init-param&gt;
+                &lt;name&gt;default-view-selector&lt;/name&gt;
+                &lt;value&gt;com.foo.MyViewSelector&lt;/value&gt;
+                &lt;/init-param&gt;
+            </source>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/sf.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/sf.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/sf.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/sf.xml Tue Aug 14 15:09:03 2007
@@ -15,18 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<p>There is still some content that has not been transferred yet at our <strong><link href="http://www.myfaces.org">*old* Website</link></strong>
-
-</p>
-</body>
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <p>There is still some content that has not been transferred yet at our <strong><link href="http://www.myfaces.org">*old* Website</link></strong>
+        </p>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/tomcat4x.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/tomcat4x.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/tomcat4x.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/tomcat4x.xml Tue Aug 14 15:09:03 2007
@@ -15,26 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="Running MyFaces apps inside Tomcat 4.x">
-
-
-  <p>MyFaces has a dependency on some of the classes in the JSP2.0 spec. As a result applications based on MyFaces will not run without the inclusion of the jsp-2.0.jar file in the <code>WEB-INF/lib</code> directory of your <code>.war</code> file.</p>
-      
-  <p>We hope this helps, if not please contact the user list at <a href="mailto:users@myfaces.apache.org">MyFaces</a>.</p>
-
-</section>
-
-
-
-</body>
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="Running MyFaces apps inside Tomcat 4.x">
+            <p>MyFaces has a dependency on some of the classes in the JSP2.0 spec. As a result applications based on MyFaces will not run without the inclusion of the jsp-2.0.jar file in the <code>WEB-INF/lib</code> directory of your <code>.war</code> file.</p>
+            <p>We hope this helps, if not please contact the user list at <a href="mailto:users@myfaces.apache.org">MyFaces</a>.</p>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/docs/tomcat55.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/docs/tomcat55.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/docs/tomcat55.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/docs/tomcat55.xml Tue Aug 14 15:09:03 2007
@@ -15,30 +15,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
-
-<body>
-
-<section name="MyFaces inside of Tomcat 5.5.x">
-
-      <p>Some users have reported problems when using MyFaces wtth Tomcat5.5.x. Here is a short guide that will hopefully help you not run into the same problems :-)</p>
-      
-      <ul>
-        <li>If your are using the binary version of MyFaces: MyFaces is packaged so that it works with Tomcat5.0.x so the <code>WEB-INF/lib/jsp-2.0.jar</code> and <code>WEB-INF/lib/commons-el.jar</code> JAR files must be removed from your WAR files (including the examples).</li>
-        <li>If you are building from source: If you want to build MyFaces from scratch to work with Tomcat 5.5.x, you have to set the property <code>tomcat.pre.5.5.version</code> in the <code>$MYFACES_HOME/build/build.default.properties</code> file to the value <code>false</code>.</li>
-      </ul>
-      <ul>
-        <li>We hope this helps, if not please contact the user list at <a href="mailto:users@myfaces.apache.org">MyFaces</a>!</li>
-      </ul>
-</section>
-
-
-
-</body>
-    
 
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="MyFaces inside of Tomcat 5.5.x">
+            <p>Some users have reported problems when using MyFaces wtth Tomcat5.5.x. Here is a short guide that will hopefully help you not run into the same problems :-)</p>
+            <ul>
+                <li>If your are using the binary version of MyFaces: MyFaces is packaged so that it works with Tomcat5.0.x so the <code>WEB-INF/lib/jsp-2.0.jar</code> and <code>WEB-INF/lib/commons-el.jar</code> JAR files must be removed from your WAR files (including the examples).</li>
+                <li>If you are building from source: If you want to build MyFaces from scratch to work with Tomcat 5.5.x, you have to set the property <code>tomcat.pre.5.5.version</code> in the <code>$MYFACES_HOME/build/build.default.properties</code> file to the value <code>false</code>.</li>
+            </ul>
+            <ul>
+                <li>We hope this helps, if not please contact the user list at <a href="mailto:users@myfaces.apache.org">MyFaces</a>!</li>
+            </ul>
+        </section>
+    </body>
 </document>

Modified: myfaces/site/trunk/src/site/xdoc/faq.xml
URL: http://svn.apache.org/viewvc/myfaces/site/trunk/src/site/xdoc/faq.xml?view=diff&rev=565945&r1=565944&r2=565945
==============================================================================
--- myfaces/site/trunk/src/site/xdoc/faq.xml (original)
+++ myfaces/site/trunk/src/site/xdoc/faq.xml Tue Aug 14 15:09:03 2007
@@ -15,43 +15,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
-      
-    <document>
 
-<body>
-
-<section name="Frequently Asked Questions">
-    
-    <p><strong>General</strong></p>
-      <ol>
-        <li><a href="#what-is">What is MyFaces?</a></li>
-        <li><a href="#tomcat5">Does MyFaces work with Tomcat 5.5?</a></li>
-        <li><a href="#extensions">Can I use MyFaces extensions with the JSF RI?</a></li>
-      </ol>
-</section>
-
-<section name="General">
-    
-      <dl>
-        <dt>What is MyFaces?</dt>
-        <dd><a id="what-is"/> MyFaces is a Open Source Implementation of the JavaServer Faces Framework. See the <a href="http://jcp.org/en/jsr/detail?id=127">JSR 127</a> and <a href="http://jcp.org/en/jsr/detail?id=252">JSR 252</a>for more info.</dd>
-      </dl>
-	  <dl>
-        <dt>Does MyFaces work with Tomcat 5.5?</dt>
-        <dd><a id="tomcat5"/> Yes, Apache MyFaces works with Tomcat5.5. If you see a blank page in your browser, try to remove the JAR files <code>jsp-2.0.jar</code> and <code>commons-el.jar</code> of the folder <code>WEB-INF/lib</code>.</dd>
-      </dl>
-	  <dl>
-        <dt>Can I use MyFaces extensions (aka Tomahawk) with the JSF RI?</dt>
-        <dd><a id="extensions"/> Yes, most of the Apache MyFaces extensions work with JSF RI. Follow the instructions in the section "Using the MyFaces extensions (aka Tomahawk) in your own web application" under <a
-                href="http://myfaces.apache.org/gettingstarted.html">http://myfaces.apache.org/gettingstarted.html</a>
-			If you notice problems please submit a ticket on <a href="issue.html">JIRA</a></dd>
-      </dl>
- </section>
-
-     </body>
-
-    
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation Maven//EN" "http://maven.apache.org/dtd/maven-xdoc.dtd">
 
+<document>
+    <body>
+        <section name="Frequently Asked Questions">
+            <p><strong>General</strong></p>
+            <ol>
+                <li><a href="#what-is">What is MyFaces?</a></li>
+                <li><a href="#tomcat5">Does MyFaces work with Tomcat 5.5?</a></li>
+                <li><a href="#extensions">Can I use MyFaces extensions with the JSF RI?</a></li>
+            </ol>
+        </section>
+        <section name="General">
+            <dl>
+                <dt>What is MyFaces?</dt>
+                <dd><a id="what-is"/> MyFaces is a Open Source Implementation of the JavaServer Faces Framework. See the <a href="http://jcp.org/en/jsr/detail?id=127">JSR 127</a> and <a href="http://jcp.org/en/jsr/detail?id=252">JSR 252</a>for more info.</dd>
+            </dl>
+            <dl>
+                <dt>Does MyFaces work with Tomcat 5.5?</dt>
+                <dd><a id="tomcat5"/> Yes, Apache MyFaces works with Tomcat5.5. If you see a blank page in your browser, try to remove the JAR files <code>jsp-2.0.jar</code> and <code>commons-el.jar</code> of the folder <code>WEB-INF/lib</code>.</dd>
+            </dl>
+            <dl>
+                <dt>Can I use MyFaces extensions (aka Tomahawk) with the JSF RI?</dt>
+                <dd><a id="extensions"/> Yes, most of the Apache MyFaces extensions work with JSF RI. Follow the instructions in the section "Using the MyFaces extensions (aka Tomahawk) in your own web application" under <a
+                        href="http://myfaces.apache.org/gettingstarted.html">http://myfaces.apache.org/gettingstarted.html</a>
+                    If you notice problems please submit a ticket on <a href="issue.html">JIRA</a></dd>
+            </dl>
+        </section>
+    </body>
 </document>