From: Takashi Sato <takashi@apache.org>
Date: Sun, 25 Dec 2011 06:59:47 +0000 (+0000)
Subject: merge r1223048 from trunk:
X-Git-Tag: 2.2.22~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b4dbbd3ee3ac51811d9ab9a140d8ce186fadc59;p=thirdparty%2Fapache%2Fhttpd.git

merge r1223048 from trunk:

Fix link to Apache Tomcat.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1223051 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 0bb5c2c0365..72762e262a9 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -73,7 +73,7 @@
           load balancing services for <module>mod_proxy</module>.
           The new <module>mod_proxy_ajp</module> module adds support for the
           <code>Apache JServ Protocol version 1.3</code> used by
-          <a href="http://jakarta.apache.org/tomcat/">Apache Tomcat</a>.</dd>
+          <a href="http://tomcat.apache.org/">Apache Tomcat</a>.</dd>
 
       <dt>Regular Expression Library Updated</dt>
       <dd>Version 5.0 of the