Index: entities/global.ent
===================================================================
--- entities/global.ent	(revision 289087)
+++ entities/global.ent	(working copy)
@@ -10,13 +10,13 @@
 <!ENTITY url.4d.doc "http://www.4d.fr/support/docs.html">
 <!ENTITY url.adabas "http://www.softwareag.com/Corporate/products/adabas/adad/">
 <!ENTITY url.adobe.acrobat "http://www.adobe.com/products/acrobat/readstep2.html">
-<!ENTITY url.apache "http://www.apache.org/">
+<!ENTITY url.apache "http://httpd.apache.org/">
 <!ENTITY url.apachedso "http://httpd.apache.org/docs/1.3/dso.html">
-<!ENTITY url.apache2.docs "http://httpd.apache.org/docs/2.0/">
-<!ENTITY url.apache2.mpm "http://httpd.apache.org/docs/2.0/mpm.html">
-<!ENTITY url.apache2.windows "http://httpd.apache.org/docs/2.0/platform/windows.html">
-<!ENTITY url.apache.source "http://www.apache.org/dist/httpd/">
-<!ENTITY url.apache.core "http://httpd.apache.org/docs/2.0/en/mod/core.html">
+<!ENTITY url.apache2.docs "http://httpd.apache.org/docs/2.2/">
+<!ENTITY url.apache2.mpm "http://httpd.apache.org/docs/2.2/mpm.html">
+<!ENTITY url.apache2.windows "http://httpd.apache.org/docs/2.2/platform/windows.html">
+<!ENTITY url.apache.source "http://httpd.apache.org/download.cgi">
+<!ENTITY url.apache.core "http://httpd.apache.org/docs/2.2/mod/core.html">
 <!ENTITY url.apache.tuscany "http://incubator.apache.org/tuscany/">
 <!ENTITY url.apc.technotes "http://svn.php.net/viewvc/pecl/apc/trunk/TECHNOTES.txt?view=co">
 <!ENTITY url.apd "http://pecl.php.net/apd">
@@ -588,7 +588,7 @@
 
 
 <!-- Obsoletes -->
-<!ENTITY url.apache.error "http://httpd.apache.org/docs/custom-error.html">
+<!ENTITY url.apache.error "http://httpd.apache.org/docs/2.2/custom-error.html">
 <!ENTITY url.bcmath "http://www.php.net/extra/number4.tar.gz">
 <!ENTITY url.chilisoft.asp "http://www.chilisoft.com/chiliasp/default.asp">
 <!ENTITY url.ircg-install "http://cvs.php.net/viewvc.cgi/php-src/ext/ircg/README.txt?view=co">