Author: kkolinko Date: Thu Nov 10 04:05:48 2011 New Revision: 1200125 URL: http://svn.apache.org/viewvc?rev=1200125&view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps /webapps/docs, part 1 of n
Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/build.xml.txt Thu Nov 10 04:05:48 2011 @@ -474,7 +474,7 @@ NOTE: The /WEB-INF/web.xml web application configuration file is not reread on a reload. If you have made changes to your web.xml file you must stop - then start the web application. + then start the web application. --> Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml Thu Nov 10 04:05:48 2011 @@ -24,7 +24,7 @@ The Apache Tomcat Servlet/JSP Container </logo> - + <body> <menu name="Links"> Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/index.html Thu Nov 10 04:05:48 2011 @@ -21,22 +21,22 @@ </head> <body> <h2>Sample Application</h2> - <p> - The example app has been packaged as a war file and can be downloaded - <a href="sample.war">here</a> (Note: make sure your browser doesn't + <p> + The example app has been packaged as a war file and can be downloaded + <a href="sample.war">here</a> (Note: make sure your browser doesn't change file extension or append a new one). </p> - <p> - The easiest way to run this application is simply to move the war file - to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically - expand and deploy the application for you. You can view it with the - following URL (assuming that you're running tomcat on port 8080 + <p> + The easiest way to run this application is simply to move the war file + to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically + expand and deploy the application for you. You can view it with the + following URL (assuming that you're running tomcat on port 8080 as is the default): <br /> <a href="http://localhost:8080/sample">http://localhost:8080/sample</a> </p> <p> - If you just want to browse the contents, you can unpack the war file + If you just want to browse the contents, you can unpack the war file with the <b>jar</b> command. </p> <pre> Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/sample/src/mypackage/Hello.java Thu Nov 10 04:05:48 2011 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml Thu Nov 10 04:05:48 2011 @@ -86,8 +86,8 @@ is discussed below. All of these compon access those files.<br/><br/></li> <li><strong>web/WEB-INF/</strong> - The special configuration files required for your application, including the web application deployment descriptor - (<code>web.xml</code>, defined in the - <a href="http://wiki.apache.org/tomcat/Specifications">Servlet Specification</a>), + (<code>web.xml</code>, defined in the + <a href="http://wiki.apache.org/tomcat/Specifications">Servlet Specification</a>), tag library descriptors for custom tag libraries you have created, and other resource files you wish to include within your web application. Even though this directory appears to be a Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt?rev=1200125&r1=1200124&r2=1200125&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/web.xml.txt Thu Nov 10 04:05:48 2011 @@ -16,8 +16,8 @@ limitations under the License. --> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org