Author: kkolinko Date: Thu Nov 10 03:54:53 2011 New Revision: 1200115 URL: http://svn.apache.org/viewvc?rev=1200115&view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps Part 1 of n. - /webapps/ROOT
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1200115&r1=1200114&r2=1200115&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/ROOT/WEB-INF/web.xml Thu Nov 10 03:54:53 2011 @@ -21,7 +21,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0" - metadata-complete="true"> + metadata-complete="true"> <display-name>Welcome to Tomcat</display-name> <description> Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp?rev=1200115&r1=1200114&r2=1200115&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp (original) +++ tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp Thu Nov 10 03:54:53 2011 @@ -110,7 +110,7 @@ request.setAttribute("tomcat7ExamplesUrl <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted. Users are defined in:</p> <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre> - <p>In Tomcat 7.0 access to the manager application is split between + <p>In Tomcat 7.0 access to the manager application is split between different users. <a href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p> <br /> <h4><a href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4> Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css?rev=1200115&r1=1200114&r2=1200115&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css (original) +++ tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.css Thu Nov 10 03:54:53 2011 @@ -98,7 +98,7 @@ a img { border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; - -khtml-border-radius: 10px; + -khtml-border-radius: 10px; } #navigation { Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg?rev=1200115&r1=1200114&r2=1200115&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg (original) +++ tomcat/tc7.0.x/trunk/webapps/ROOT/tomcat.svg Thu Nov 10 03:54:53 2011 @@ -29,7 +29,7 @@ <!ENTITY ns_svg "http://www.w3.org/2000/svg"> <!ENTITY ns_xlink "http://www.w3.org/1999/xlink"> ]> -<svg +<svg xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;" i:viewOrigin="176.7139 486.707" i:rulerOrigin="-156 -296" i:pageBounds="156 496 456 296" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" width="260.162" height="184.413" viewBox="0 0 260.162 184.413" overflow="visible" enable-background="new 0 0 260.162 184.413" @@ -112,10 +112,10 @@ c-48.118-23.977-57.183-84.71-48.977-117.289c2.283,12.454,6.424,20.266,15.394,24.098c19.533-5.591,46.423-6.033,66.231-0.57 c8.255-6.001,11.456-15.169,13.204-23.18C236.029,15.921,235.777,36.055,235.784,36.059z"/> <g> - <rect x="133.209" y="90.51" i:knockout="Off" width="26.245" height="3.239"/> - <rect x="133.209" y="82.732" i:knockout="Off" width="26.245" height="3.24"/> - <rect x="213.35" y="90.51" i:knockout="Off" width="26.244" height="3.239"/> - <rect x="213.35" y="82.732" i:knockout="Off" width="26.244" height="3.24"/> + <rect x="133.209" y="90.51" i:knockout="Off" width="26.245" height="3.239"/> + <rect x="133.209" y="82.732" i:knockout="Off" width="26.245" height="3.24"/> + <rect x="213.35" y="90.51" i:knockout="Off" width="26.244" height="3.239"/> + <rect x="213.35" y="82.732" i:knockout="Off" width="26.244" height="3.24"/> <g> <path i:knockout="Off" d="M204.1,63.524h-27.188h-3.021h-12.561v-2.917h13.31c1.639-7.018,1.963-13.725-0.014-17.125 c-0.844-1.446-2.01-2.121-3.674-2.121c-7.609,0-10.753,8.046-10.884,8.389l0.002-0.003l-2.73-1.024 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org