чт, 28 апр. 2022 г. в 14:14, <ma...@apache.org>: > > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch main > in repository https://gitbox.apache.org/repos/asf/tomcat.git > > > The following commit(s) were added to refs/heads/main by this push: > new ca6c090f39 Update wiki links to use new locations > ca6c090f39 is described below > > commit ca6c090f39c820e31bec8ddd6b118cb259f45b27 > Author: Mark Thomas <ma...@apache.org> > AuthorDate: Thu Apr 28 12:13:46 2022 +0100 > > Update wiki links to use new locations > --- > README.md | 2 +- > webapps/ROOT/index.jsp | 10 +++++----- > webapps/docs/appdev/processes.xml | 2 +- > webapps/docs/appdev/project.xml | 2 +- > webapps/docs/appdev/source.xml | 2 +- > webapps/docs/architecture/project.xml | 2 +- > webapps/docs/cluster-howto.xml | 2 +- > webapps/docs/config/context.xml | 2 +- > webapps/docs/config/project.xml | 2 +- > webapps/docs/developers.xml | 2 +- > webapps/docs/index.xml | 4 ++-- > webapps/docs/introduction.xml | 6 +++--- > webapps/docs/jasper-howto.xml | 2 +- > webapps/docs/jndi-resources-howto.xml | 8 ++++---- > webapps/docs/project.xml | 4 ++-- > webapps/docs/realm-howto.xml | 2 +- > webapps/docs/tribes/project.xml | 2 +- > 17 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/README.md b/README.md > index e1e224a189..a838d90223 100644 > --- a/README.md > +++ b/README.md [...] > --- a/webapps/ROOT/index.jsp > +++ b/webapps/ROOT/index.jsp > @@ -38,7 +38,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); > <span id="nav-hosts"><a > href="${tomcatDocUrl}">Documentation</a></span> > <span id="nav-config"><a > href="${tomcatDocUrl}config/">Configuration</a></span> > <span id="nav-examples"><a > href="${tomcatExamplesUrl}">Examples</a></span> > - <span id="nav-wiki"><a > href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a></span> > + <span id="nav-wiki"><a > href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage";>Wiki</a></span>
"FrontPage" at the above URL is the old page in "Migrated content". It might be better to link to the actual front page, https://cwiki.apache.org/confluence/display/TOMCAT/ BTW, Confluence prefers to spell Tomcat in URLs in uppercase, like the above. > <span id="nav-lists"><a > href="${tomcatUrl}lists.html">Mailing Lists</a></span> > <span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find > Help</a></span> > <br class="separator" /> > @@ -93,8 +93,8 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); > </div> > <div class="col25"> > <div class="container"> > - <p><a > href="https://wiki.apache.org/tomcat/Specifications";>Servlet > Specifications</a></p> > - <p><a > href="https://wiki.apache.org/tomcat/TomcatVersions";>Tomcat Versions</a></p> > + <p><a > href="https://cwiki.apache.org/confluence/display/tomcat/Specifications";>Servlet > Specifications</a></p> > + <p><a > href="https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions";>Tomcat > Versions</a></p> > </div> > </div> > <br class="separator" /> > @@ -120,7 +120,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); > <h3>Documentation</h3> > <h4><a href="${tomcatDocUrl}">Tomcat > @VERSION_MAJOR_MINOR@ Documentation</a></h4> > <h4><a href="${tomcatDocUrl}config/">Tomcat > @VERSION_MAJOR_MINOR@ Configuration</a></h4> > - <h4><a > href="https://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a></h4> > + <h4><a > href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage";>Tomcat > Wiki</a></h4> > <p>Find additional important configuration > information in:</p> > <pre>$CATALINA_HOME/RUNNING.txt</pre> > <p>Developers may be interested in:</p> > @@ -184,7 +184,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/"); > <li><a > href="${tomcatUrl}getinvolved.html">Overview</a></li> > <li><a href="${tomcatUrl}source.html">Source > Repositories</a></li> > <li><a href="${tomcatUrl}lists.html">Mailing > Lists</a></li> > - <li><a > href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a></li> > + <li><a > href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage";>Wiki</a></li> > </ul> > </div> > </div> > diff --git a/webapps/docs/appdev/processes.xml > b/webapps/docs/appdev/processes.xml > index ef942466e4..97642151dc 100644 > --- a/webapps/docs/appdev/processes.xml > +++ b/webapps/docs/appdev/processes.xml [....] Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
