Author: kkolinko
Date: Fri Jan 24 14:59:29 2014
New Revision: 1561027
URL: http://svn.apache.org/r1561027
Log:
Align ROOT/index.html and ROOT/index.jsp
It is backport of r1560857 and followup to r648575 that fixed one of the two
files.
The following fixes were part of r648575:
- Fix broken links if ROOT application is renamed.
- Merge "Examples" section of menu into "Miscellaneous" one.
The following fixes are new:
- Remove dead links to Sun sites.
- Add link to the Specifications page of Tomcat Wiki.
- Correct mailing lists links so that they point to the Mailing List
page on the site, so that people have a chance to read instructions there.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561027&r1=1561026&r2=1561027&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 24 14:59:29 2014
@@ -53,24 +53,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, rjung
-1:
-* Align ROOT/index.html and ROOT/index.jsp
- It is backport of r1560857 and followup to r648575 that
- fixed one of the two files.
-
- The following fixes were part of r648575:
- - Fix broken links if ROOT application is renamed.
- - Merge "Examples" section of menu into "Miscellaneous" one.
-
- The following fixes are new:
- - Remove dead links to Sun sites.
- - Add link to the Specifications page of Tomcat Wiki.
- - Correct mailing lists links so that they point to the Mailing List
- page on the site, so that people have a chance to read instructions there.
-
- https://people.apache.org/~kkolinko/patches/2014-01-24_tc6_ROOT_index.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Remove second copy of RUNNING.txt from the full-docs distribution.
(Backport of r981845)
https://people.apache.org/~kkolinko/patches/2014-01-24_tc6_fulldocs_RUNNING.patch
Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=1561027&r1=1561026&r2=1561027&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Fri Jan 24 14:59:29 2014
@@ -160,8 +160,7 @@
<td class="menu">
<a href="/examples/servlets/">Servlets Examples</a><br/>
<a href="/examples/jsp/">JSP Examples</a><br/>
- <a
href="http://java.sun.com/products/jsp";>Sun's Java Server Pages Site</a><br/>
- <a
href="http://java.sun.com/products/servlet";>Sun's Servlet Site</a><br/>
+ <a
href="http://wiki.apache.org/tomcat/Specifications";>Specifications</a><br/>
</td>
</tr>
@@ -188,8 +187,8 @@
<p>Tomcat mailing lists are available at the Tomcat project web
site:</p>
<ul>
- <li><b><a
href="mailto:[email protected]";>[email protected]</a></b> for
general questions related to configuring and using Tomcat</li>
- <li><b><a
href="mailto:[email protected]";>[email protected]</a></b> for
developers working on Tomcat</li>
+ <li><b><a
href="http://tomcat.apache.org/lists.html#tomcat-users";>tomcat-users</a></b>
for general questions related to configuring and using Tomcat</li>
+ <li><b><a
href="http://tomcat.apache.org/lists.html#tomcat-dev";>tomcat-dev</a></b> for
developers working on Tomcat</li>
</ul>
<p>Thanks for using Tomcat!</p>
Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?rev=1561027&r1=1561026&r2=1561027&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Fri Jan 24 14:59:29 2014
@@ -115,8 +115,8 @@
</tr>
<tr>
<td class="menu">
- <a href="manager/status">Status</a><br/>
- <a href="manager/html">Tomcat Manager</a><br/>
+ <a href="/manager/status">Status</a><br/>
+ <a href="/manager/html">Tomcat Manager</a><br/>
</td>
</tr>
@@ -129,8 +129,8 @@
<tr>
<td class="menu">
<a href="RELEASE-NOTES.txt">Release Notes</a><br/>
- <a href="docs/changelog.html">Change Log</a><br/>
- <a href="docs">Tomcat Documentation</a><br/>
+ <a href="/docs/changelog.html">Change Log</a><br/>
+ <a href="/docs">Tomcat Documentation</a><br/>
</td>
</tr>
@@ -155,26 +155,13 @@
<br/>
<table width="100%" border="1" cellspacing="0" cellpadding="3">
<tr>
- <th>Examples</th>
- </tr>
- <tr>
- <td class="menu">
- <a href="examples/servlets/">Servlets Examples</a><br/>
- <a href="examples/jsp/">JSP Examples</a><br/>
- <a href="webdav/">WebDAV capabilities</a><br/>
-
- </td>
- </tr>
- </table>
- <br/>
- <table width="100%" border="1" cellspacing="0" cellpadding="3">
- <tr>
<th>Miscellaneous</th>
</tr>
<tr>
<td class="menu">
- <a
href="http://java.sun.com/products/jsp";>Sun's Java Server Pages Site</a><br/>
- <a
href="http://java.sun.com/products/servlet";>Sun's Servlet Site</a><br/>
+ <a href="/examples/servlets/">Servlets Examples</a><br/>
+ <a href="/examples/jsp/">JSP Examples</a><br/>
+ <a
href="http://wiki.apache.org/tomcat/Specifications";>Specifications</a><br/>
</td>
</tr>
@@ -190,7 +177,7 @@
<p>As you may have guessed by now, this is the default Tomcat home
page. It can be found on the local filesystem at:</p>
<p class="code">$CATALINA_HOME/webapps/ROOT/index.jsp</p>
- <p>where "$CATALINA_HOME" is the root of the Tomcat installation
directory. If you're seeing this page, and you don't think you should be, then
you're either a user who has arrived at new installation of Tomcat, or you're
an administrator who hasn't got his/her setup quite right. Providing the latter
is the case, please refer to the <a href="docs">Tomcat Documentation</a> for
more detailed setup and administration information than is found in the INSTALL
file.</p>
+ <p>where "$CATALINA_HOME" is the root of the Tomcat installation
directory. If you're seeing this page, and you don't think you should be, then
you're either a user who has arrived at new installation of Tomcat, or you're
an administrator who hasn't got his/her setup quite right. Providing the latter
is the case, please refer to the <a href="/docs">Tomcat Documentation</a> for
more detailed setup and administration information than is found in the INSTALL
file.</p>
<p><b>NOTE: For security reasons, using the manager webapp
is restricted to users with certain roles such as
"manager-gui".</b>
@@ -201,8 +188,8 @@
<p>Tomcat mailing lists are available at the Tomcat project web
site:</p>
<ul>
- <li><b><a
href="mailto:[email protected]";>[email protected]</a></b> for
general questions related to configuring and using Tomcat</li>
- <li><b><a
href="mailto:[email protected]";>[email protected]</a></b> for
developers working on Tomcat</li>
+ <li><b><a
href="http://tomcat.apache.org/lists.html#tomcat-users";>tomcat-users</a></b>
for general questions related to configuring and using Tomcat</li>
+ <li><b><a
href="http://tomcat.apache.org/lists.html#tomcat-dev";>tomcat-dev</a></b> for
developers working on Tomcat</li>
</ul>
<p>Thanks for using Tomcat!</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1561027&r1=1561026&r2=1561027&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 24 14:59:29 2014
@@ -57,6 +57,10 @@
<fix>
Fix broken link in Jasper How-To documentation. (markt)
</fix>
+ <fix>
+ Align index.html and index.jsp in ROOT web application. Correct links
+ to specifications and to the Tomcat mailing lists. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
