Author: kkolinko Date: Thu Nov 10 04:19:11 2011 New Revision: 1200139 URL: http://svn.apache.org/viewvc?rev=1200139&view=rev Log: Merging r1187809 - Trailing whitespace removal from /webapps Last remaining files. Updated mergeinfo.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/index.xml tomcat/tc7.0.x/trunk/webapps/docs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 04:19:11 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199996 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199996 Modified: tomcat/tc7.0.x/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/index.xml?rev=1200139&r1=1200138&r2=1200139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Thu Nov 10 04:19:11 2011 @@ -158,7 +158,7 @@ are responsible for installing, configur - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Apache Tomcat with servers like Apache HTTPd, IIS and others.</li> -<li>Servlet 3.0 +<li>Servlet 3.0 <a href="http://jcp.org/aboutJava/communityprocess/final/jsr315/index.html"> <strong>Specification</strong></a> and <a href="http://download.oracle.com/javaee/6/api/index.html?javax/servlet/package-summary.html"> Modified: tomcat/tc7.0.x/trunk/webapps/docs/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/project.xml?rev=1200139&r1=1200138&r2=1200139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Thu Nov 10 04:19:11 2011 @@ -56,7 +56,7 @@ <item name="18) Clustering" href="cluster-howto.html"/> <item name="19) Load Balancer" href="balancer-howto.html"/> <item name="20) Connectors" href="connectors.html"/> - <item name="21) Monitoring and Management" + <item name="21) Monitoring and Management" href="monitoring.html"/> <item name="22) Logging" href="logging.html"/> <item name="23) APR/Native" href="apr.html"/> @@ -68,9 +68,9 @@ <item name="28) Security Considerations" href="security-howto.html"/> <item name="29) Windows Service" href="windows-service-howto.html"/> - <item name="30) Windows Authentication" + <item name="30) Windows Authentication" href="windows-auth-howto.html"/> - <item name="31) Tomcat's JDBC Pool" + <item name="31) Tomcat's JDBC Pool" href="jdbc-pool.html"/> </menu> @@ -81,7 +81,7 @@ <item name="Servlet Javadocs" href="servletapi/index.html"/> <item name="JSP 2.2 Javadocs" href="jspapi/index.html"/> <item name="EL 2.2 Javadocs" href="elapi/index.html"/> - <item name="JK 1.2 Documentation" + <item name="JK 1.2 Documentation" href="http://tomcat.apache.org/connectors-doc/"/> </menu> Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1200139&r1=1200138&r2=1200139&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Thu Nov 10 04:19:11 2011 @@ -284,7 +284,7 @@ <xsl:value-of select="@anchor" /> </xsl:when> <xsl:otherwise> - <xsl:if test="local-name()='subsection' and + <xsl:if test="local-name()='subsection' and count(//*[(local-name()='section' or local-name()='subsection') and @name=current()/@name]) > 1 "> <xsl:value-of select="concat(ancestor::section/@name, '/')"/> @@ -518,7 +518,7 @@ <xsl:variable name="link"><xsl:value-of select="$buglink"/><xsl:value-of select="text()"/></xsl:variable> <a href="{$link}"><xsl:apply-templates/></a> </xsl:template> - + <!-- Link to a SVN revision report --> <xsl:template match="rev"> <xsl:variable name="link"><xsl:value-of select="$revlink"/><xsl:value-of select="text()"/></xsl:variable> @@ -546,7 +546,7 @@ </font> </td> </xsl:template> - + <!-- Process everything else by just passing it through --> <xsl:template match="*|@*"> <xsl:copy> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org