Author: kkolinko
Date: Sun Oct 2 18:00:39 2011
New Revision: 1178210
URL: http://svn.apache.org/viewvc?rev=1178210&view=rev
Log:
Merged revisions r1175690, r1178209 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50923
Use distinct color for <code> and add small spacing around it.
Do not color attribute names (the names in the first column in attribute lists
in Configuration reference).
Commented-out unused xsl:variable.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 18:00:39 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,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,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,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177978
+/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,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,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,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177978,1178209
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1178210&r1=1178209&r2=1178210&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Oct 2 18:00:39 2011
@@ -78,6 +78,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <add>
+ <bug>50923</bug>: Use distinct color for <code>code</code> tag
+ in Tomcat documentation, for better readability. (kkolinko)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.22 (markt)" rtext="released 2011-10-01">
<subsection name="Catalina">
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=1178210&r1=1178209&r2=1178210&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sun Oct 2 18:00:39 2011
@@ -69,9 +69,11 @@
<xsl:variable name="name">
<xsl:value-of select="."/>
</xsl:variable>
+ <!--
<xsl:variable name="email">
<xsl:value-of select="@email"/>
</xsl:variable>
+ -->
<meta name="author" content="{$name}"/>
<!-- Don't publish e-mail addresses
<meta name="email" content="{$email}"/>
@@ -81,6 +83,10 @@
.noPrint {display: none;}
td#mainBody {width: 100%;}
</style>
+ <style type="text/css">
+ code {color:rgb(0,128,128);padding:0 0.1em;}
+ code.attributeName {color:rgb(0,0,0);}
+ </style>
</head>
<body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
@@ -358,10 +364,10 @@
<tr>
<td align="left" valign="center">
<xsl:if test="@required = 'true'">
- <strong><code><xsl:value-of select="@name"/></code></strong>
+ <strong><code class="attributeName"><xsl:value-of
select="@name"/></code></strong>
</xsl:if>
<xsl:if test="@required != 'true'">
- <code><xsl:value-of select="@name"/></code>
+ <code class="attributeName"><xsl:value-of select="@name"/></code>
</xsl:if>
</td>
<td align="left" valign="center">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
