upgrade to apache-2.0.47/apr-0.9.4.2.0.47.

Changes with Apache 2.0.47
  *) SECURITY [CAN-2003-0192]: Fixed a bug whereby certain sequences
     of per-directory renegotiations and the SSLCipherSuite directive
     being used to upgrade from a weak ciphersuite to a strong one
     could result in the weak ciphersuite being used in place of the
     strong one.  [Ben Laurie]
  *) SECURITY [CAN-2003-0253]: Fixed a bug in prefork MPM causing
     temporary denial of service when accept() on a rarely accessed port
     returns certain errors.  Reported by Saheed Akhtar
     <S.Akhtar@talis.com>.  [Jeff Trawick]
  *) SECURITY [CAN-2003-0254]: Fixed a bug in ftp proxy causing denial
     of service when target host is IPv6 but proxy server can't create
     IPv6 socket.  Fixed by the reporter.  [Yoshioka Tsuneo
     <tsuneo.yoshioka@f-secure.com>]
  *) SECURITY [VU#379828] Prevent the server from crashing when entering
     infinite loops. The new LimitInternalRecursion directive configures
     limits of subsequent internal redirects and nested subrequests, after
     which the request will be aborted.  PR 19753 (and probably others).
     [William Rowe, Jeff Trawick, André Malo]
  *) core_output_filter: don't split the brigade after a FLUSH bucket if
     it's the last bucket.  This prevents creating unneccessary empty
     brigades which may not be destroyed until the end of a keepalive
     connection.
     [Juan Rivera <Juan.Rivera@citrix.com>]
  *) Add support for "streamy" PROPFIND responses.
     [Ben Collins-Sussman <sussman@collab.net>]
  *) mod_cgid: Eliminate a double-close of a socket.  This resolves
     various operational problems in a threaded MPM, since on the
     second attempt to close the socket, the same descriptor was
     often already in use by another thread for another purpose.
     [Jeff Trawick]
  *) mod_negotiation: Introduce "prefer-language" environment variable,
     which allows to influence the negotiation process on request basis
     to prefer a certain language.  [André Malo]
  *) Make mod_expires' ExpiresByType work properly, including for
     dynamically-generated documents.  [Ken Coar, Bill Stoddard]

3 files changed, 177 insertions, 16 deletions

diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 0d961674010..b555563d5ef 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,5 +1,5 @@
 DISTNAME=		httpd-${APACHE_VERSION}
-APACHE_VERSION=		2.0.46
+APACHE_VERSION=		2.0.47
 APR_VERSION=            0.9.4
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 4ae86340a63..c35e063f605 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2003/05/29 01:02:29 itojun Exp $
+@comment $NetBSD: PLIST,v 1.16 2003/07/09 08:09:05 itojun Exp $
 etc/rc.d/apache
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -143,6 +143,7 @@ share/httpd/htdocs/index.html.ru.koi8-r
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.sv
 share/httpd/htdocs/index.html.var
+share/httpd/htdocs/index.html.zh-cn.gb2312
 share/httpd/htdocs/index.html.zh-tw.big5
 share/httpd/icons/README
 share/httpd/icons/a.gif
@@ -366,6 +367,7 @@ share/httpd/icons/world1.png
 share/httpd/icons/world2.gif
 share/httpd/icons/world2.png
 share/httpd/manual/LICENSE
+share/httpd/manual/bind.html
 share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.ja.jis
 share/httpd/manual/bind.html.ko.euc-kr
@@ -373,6 +375,7 @@ share/httpd/manual/bind.xml
 share/httpd/manual/bind.xml.ja
 share/httpd/manual/bind.xml.ko
 share/httpd/manual/bind.xml.meta
+share/httpd/manual/cgi_path.html
 share/httpd/manual/cgi_path.html.en
 share/httpd/manual/cgi_path.html.ja.jis
 share/httpd/manual/cgi_path.html.ko.euc-kr
@@ -380,6 +383,7 @@ share/httpd/manual/cgi_path.xml
 share/httpd/manual/cgi_path.xml.ja
 share/httpd/manual/cgi_path.xml.ko
 share/httpd/manual/cgi_path.xml.meta
+share/httpd/manual/configuring.html
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.ja.jis
 share/httpd/manual/configuring.html.ko.euc-kr
@@ -387,6 +391,7 @@ share/httpd/manual/configuring.xml
 share/httpd/manual/configuring.xml.ja
 share/httpd/manual/configuring.xml.ko
 share/httpd/manual/configuring.xml.meta
+share/httpd/manual/content-negotiation.html
 share/httpd/manual/content-negotiation.html.en
 share/httpd/manual/content-negotiation.html.ja.jis
 share/httpd/manual/content-negotiation.html.ko.euc-kr
@@ -394,6 +399,7 @@ share/httpd/manual/content-negotiation.xml
 share/httpd/manual/content-negotiation.xml.ja
 share/httpd/manual/content-negotiation.xml.ko
 share/httpd/manual/content-negotiation.xml.meta
+share/httpd/manual/custom-error.html
 share/httpd/manual/custom-error.html.en
 share/httpd/manual/custom-error.html.ja.jis
 share/httpd/manual/custom-error.html.ko.euc-kr
@@ -401,34 +407,44 @@ share/httpd/manual/custom-error.xml
 share/httpd/manual/custom-error.xml.ja
 share/httpd/manual/custom-error.xml.ko
 share/httpd/manual/custom-error.xml.meta
+share/httpd/manual/developer/API.html
 share/httpd/manual/developer/API.html.en
 share/httpd/manual/developer/API.xml
 share/httpd/manual/developer/API.xml.meta
+share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/debugging.html.en
 share/httpd/manual/developer/debugging.xml
 share/httpd/manual/developer/debugging.xml.meta
+share/httpd/manual/developer/documenting.html
 share/httpd/manual/developer/documenting.html.en
 share/httpd/manual/developer/documenting.xml
 share/httpd/manual/developer/documenting.xml.meta
+share/httpd/manual/developer/filters.html
 share/httpd/manual/developer/filters.html.en
 share/httpd/manual/developer/filters.xml
 share/httpd/manual/developer/filters.xml.meta
+share/httpd/manual/developer/hooks.html
 share/httpd/manual/developer/hooks.html.en
 share/httpd/manual/developer/hooks.xml
 share/httpd/manual/developer/hooks.xml.meta
+share/httpd/manual/developer/index.html
 share/httpd/manual/developer/index.html.en
 share/httpd/manual/developer/index.xml
 share/httpd/manual/developer/index.xml.meta
+share/httpd/manual/developer/modules.html
 share/httpd/manual/developer/modules.html.en
 share/httpd/manual/developer/modules.html.ja.jis
 share/httpd/manual/developer/modules.xml
 share/httpd/manual/developer/modules.xml.meta
+share/httpd/manual/developer/request.html
 share/httpd/manual/developer/request.html.en
 share/httpd/manual/developer/request.xml
 share/httpd/manual/developer/request.xml.meta
+share/httpd/manual/developer/thread_safety.html
 share/httpd/manual/developer/thread_safety.html.en
 share/httpd/manual/developer/thread_safety.xml
 share/httpd/manual/developer/thread_safety.xml.meta
+share/httpd/manual/dns-caveats.html
 share/httpd/manual/dns-caveats.html.en
 share/httpd/manual/dns-caveats.html.ja.jis
 share/httpd/manual/dns-caveats.html.ko.euc-kr
@@ -436,6 +452,7 @@ share/httpd/manual/dns-caveats.xml
 share/httpd/manual/dns-caveats.xml.ja
 share/httpd/manual/dns-caveats.xml.ko
 share/httpd/manual/dns-caveats.xml.meta
+share/httpd/manual/dso.html
 share/httpd/manual/dso.html.en
 share/httpd/manual/dso.html.ja.jis
 share/httpd/manual/dso.html.ko.euc-kr
@@ -443,6 +460,7 @@ share/httpd/manual/dso.xml
 share/httpd/manual/dso.xml.ja
 share/httpd/manual/dso.xml.ko
 share/httpd/manual/dso.xml.meta
+share/httpd/manual/env.html
 share/httpd/manual/env.html.en
 share/httpd/manual/env.html.ja.jis
 share/httpd/manual/env.html.ko.euc-kr
@@ -450,10 +468,12 @@ share/httpd/manual/env.xml
 share/httpd/manual/env.xml.ja
 share/httpd/manual/env.xml.ko
 share/httpd/manual/env.xml.meta
+share/httpd/manual/faq/all_in_one.html
 share/httpd/manual/faq/all_in_one.html.en
 share/httpd/manual/faq/all_in_one.xml
 share/httpd/manual/faq/all_in_one.xml.meta
 share/httpd/manual/faq/categories.xml
+share/httpd/manual/faq/error.html
 share/httpd/manual/faq/error.html.en
 share/httpd/manual/faq/error.xml
 share/httpd/manual/faq/error.xml.meta
@@ -461,9 +481,11 @@ share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
 share/httpd/manual/faq/index.xml
 share/httpd/manual/faq/index.xml.meta
+share/httpd/manual/faq/support.html
 share/httpd/manual/faq/support.html.en
 share/httpd/manual/faq/support.xml
 share/httpd/manual/faq/support.xml.meta
+share/httpd/manual/filter.html
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.ja.jis
 share/httpd/manual/filter.html.ko.euc-kr
@@ -471,11 +493,13 @@ share/httpd/manual/filter.xml
 share/httpd/manual/filter.xml.ja
 share/httpd/manual/filter.xml.ko
 share/httpd/manual/filter.xml.meta
+share/httpd/manual/glossary.html
 share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.ko.euc-kr
 share/httpd/manual/glossary.xml
 share/httpd/manual/glossary.xml.ko
 share/httpd/manual/glossary.xml.meta
+share/httpd/manual/handler.html
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.ja.jis
 share/httpd/manual/handler.html.ko.euc-kr
@@ -483,53 +507,50 @@ share/httpd/manual/handler.xml
 share/httpd/manual/handler.xml.ja
 share/httpd/manual/handler.xml.ko
 share/httpd/manual/handler.xml.meta
+share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.ja.jis
 share/httpd/manual/howto/auth.xml
 share/httpd/manual/howto/auth.xml.meta
+share/httpd/manual/howto/cgi.html
 share/httpd/manual/howto/cgi.html.en
 share/httpd/manual/howto/cgi.html.ja.jis
 share/httpd/manual/howto/cgi.xml
 share/httpd/manual/howto/cgi.xml.ja
 share/httpd/manual/howto/cgi.xml.meta
+share/httpd/manual/howto/htaccess.html
 share/httpd/manual/howto/htaccess.html.en
 share/httpd/manual/howto/htaccess.xml
 share/httpd/manual/howto/htaccess.xml.meta
+share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
 share/httpd/manual/howto/index.xml
 share/httpd/manual/howto/index.xml.meta
+share/httpd/manual/howto/public_html.html
 share/httpd/manual/howto/public_html.html.en
 share/httpd/manual/howto/public_html.xml
 share/httpd/manual/howto/public_html.xml.meta
+share/httpd/manual/howto/ssi.html
 share/httpd/manual/howto/ssi.html.en
 share/httpd/manual/howto/ssi.html.ja.jis
 share/httpd/manual/howto/ssi.xml
 share/httpd/manual/howto/ssi.xml.ja
 share/httpd/manual/howto/ssi.xml.meta
 share/httpd/manual/images/apache_header.gif
-share/httpd/manual/images/apache_header.png
 share/httpd/manual/images/custom_errordocs.gif
-share/httpd/manual/images/custom_errordocs.png
 share/httpd/manual/images/down.gif
 share/httpd/manual/images/favicon.ico
 share/httpd/manual/images/feather.gif
 share/httpd/manual/images/home.gif
-share/httpd/manual/images/home.png
 share/httpd/manual/images/index.gif
-share/httpd/manual/images/index.png
 share/httpd/manual/images/left.gif
-share/httpd/manual/images/mod_rewrite_fig1.fig
 share/httpd/manual/images/mod_rewrite_fig1.gif
-share/httpd/manual/images/mod_rewrite_fig1.png
-share/httpd/manual/images/mod_rewrite_fig2.fig
 share/httpd/manual/images/mod_rewrite_fig2.gif
-share/httpd/manual/images/mod_rewrite_fig2.png
 share/httpd/manual/images/pixel.gif
-share/httpd/manual/images/pixel.png
 share/httpd/manual/images/right.gif
 share/httpd/manual/images/sub.gif
-share/httpd/manual/images/sub.png
 share/httpd/manual/images/up.gif
+share/httpd/manual/index.html
 share/httpd/manual/index.html.de
 share/httpd/manual/index.html.en
 share/httpd/manual/index.html.fr
@@ -540,6 +561,7 @@ share/httpd/manual/index.xml.de
 share/httpd/manual/index.xml.ja
 share/httpd/manual/index.xml.ko
 share/httpd/manual/index.xml.meta
+share/httpd/manual/install.html
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
 share/httpd/manual/install.html.ja.jis
@@ -551,6 +573,7 @@ share/httpd/manual/install.xml.ja
 share/httpd/manual/install.xml.ko
 share/httpd/manual/install.xml.meta
 share/httpd/manual/install.xml.ru
+share/httpd/manual/invoking.html
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
 share/httpd/manual/invoking.html.ja.jis
@@ -562,9 +585,11 @@ share/httpd/manual/invoking.xml.ja
 share/httpd/manual/invoking.xml.ko
 share/httpd/manual/invoking.xml.meta
 share/httpd/manual/invoking.xml.ru
+share/httpd/manual/license.html
 share/httpd/manual/license.html.en
 share/httpd/manual/license.xml
 share/httpd/manual/license.xml.meta
+share/httpd/manual/logs.html
 share/httpd/manual/logs.html.en
 share/httpd/manual/logs.html.ja.jis
 share/httpd/manual/logs.html.ko.euc-kr
@@ -572,30 +597,39 @@ share/httpd/manual/logs.xml
 share/httpd/manual/logs.xml.ja
 share/httpd/manual/logs.xml.ko
 share/httpd/manual/logs.xml.meta
+share/httpd/manual/misc/custom_errordocs.html
 share/httpd/manual/misc/custom_errordocs.html.en
 share/httpd/manual/misc/custom_errordocs.xml
 share/httpd/manual/misc/custom_errordocs.xml.meta
+share/httpd/manual/misc/descriptors.html
 share/httpd/manual/misc/descriptors.html.en
 share/httpd/manual/misc/descriptors.xml
 share/httpd/manual/misc/descriptors.xml.meta
+share/httpd/manual/misc/fin_wait_2.html
 share/httpd/manual/misc/fin_wait_2.html.en
 share/httpd/manual/misc/fin_wait_2.xml
 share/httpd/manual/misc/fin_wait_2.xml.meta
+share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
 share/httpd/manual/misc/index.xml
 share/httpd/manual/misc/index.xml.meta
+share/httpd/manual/misc/known_client_problems.html
 share/httpd/manual/misc/known_client_problems.html.en
 share/httpd/manual/misc/known_client_problems.xml
 share/httpd/manual/misc/known_client_problems.xml.meta
+share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.xml
 share/httpd/manual/misc/perf-tuning.xml.meta
+share/httpd/manual/misc/rewriteguide.html
 share/httpd/manual/misc/rewriteguide.html.en
 share/httpd/manual/misc/rewriteguide.xml
 share/httpd/manual/misc/rewriteguide.xml.meta
+share/httpd/manual/misc/security_tips.html
 share/httpd/manual/misc/security_tips.html.en
 share/httpd/manual/misc/security_tips.xml
 share/httpd/manual/misc/security_tips.xml.meta
+share/httpd/manual/misc/tutorials.html
 share/httpd/manual/misc/tutorials.html.en
 share/httpd/manual/misc/tutorials.xml
 share/httpd/manual/misc/tutorials.xml.meta
@@ -604,16 +638,19 @@ share/httpd/manual/mod/allmodules.xml.de
 share/httpd/manual/mod/allmodules.xml.ja
 share/httpd/manual/mod/allmodules.xml.ko
 share/httpd/manual/mod/allmodules.xml.ru
+share/httpd/manual/mod/beos.html
 share/httpd/manual/mod/beos.html.en
 share/httpd/manual/mod/beos.html.ko.euc-kr
 share/httpd/manual/mod/beos.xml
 share/httpd/manual/mod/beos.xml.ko
 share/httpd/manual/mod/beos.xml.meta
+share/httpd/manual/mod/core.html
 share/httpd/manual/mod/core.html.de
 share/httpd/manual/mod/core.html.en
 share/httpd/manual/mod/core.xml
 share/httpd/manual/mod/core.xml.de
 share/httpd/manual/mod/core.xml.meta
+share/httpd/manual/mod/directive-dict.html
 share/httpd/manual/mod/directive-dict.html.en
 share/httpd/manual/mod/directive-dict.html.ja.jis
 share/httpd/manual/mod/directive-dict.html.ko.euc-kr
@@ -621,6 +658,7 @@ share/httpd/manual/mod/directive-dict.xml
 share/httpd/manual/mod/directive-dict.xml.ja
 share/httpd/manual/mod/directive-dict.xml.ko
 share/httpd/manual/mod/directive-dict.xml.meta
+share/httpd/manual/mod/directives.html
 share/httpd/manual/mod/directives.html.de
 share/httpd/manual/mod/directives.html.en
 share/httpd/manual/mod/directives.html.ja.jis
@@ -632,6 +670,7 @@ share/httpd/manual/mod/directives.xml.ja
 share/httpd/manual/mod/directives.xml.ko
 share/httpd/manual/mod/directives.xml.meta
 share/httpd/manual/mod/directives.xml.ru
+share/httpd/manual/mod/index.html
 share/httpd/manual/mod/index.html.de
 share/httpd/manual/mod/index.html.en
 share/httpd/manual/mod/index.html.ja.jis
@@ -641,16 +680,19 @@ share/httpd/manual/mod/index.xml.de
 share/httpd/manual/mod/index.xml.ja
 share/httpd/manual/mod/index.xml.ko
 share/httpd/manual/mod/index.xml.meta
+share/httpd/manual/mod/leader.html
 share/httpd/manual/mod/leader.html.en
 share/httpd/manual/mod/leader.html.ko.euc-kr
 share/httpd/manual/mod/leader.xml
 share/httpd/manual/mod/leader.xml.ko
 share/httpd/manual/mod/leader.xml.meta
+share/httpd/manual/mod/mod_access.html
 share/httpd/manual/mod/mod_access.html.en
 share/httpd/manual/mod/mod_access.html.ja.jis
 share/httpd/manual/mod/mod_access.xml
 share/httpd/manual/mod/mod_access.xml.ja
 share/httpd/manual/mod/mod_access.xml.meta
+share/httpd/manual/mod/mod_actions.html
 share/httpd/manual/mod/mod_actions.html.en
 share/httpd/manual/mod/mod_actions.html.ja.jis
 share/httpd/manual/mod/mod_actions.html.ko.euc-kr
@@ -658,11 +700,13 @@ share/httpd/manual/mod/mod_actions.xml
 share/httpd/manual/mod/mod_actions.xml.ja
 share/httpd/manual/mod/mod_actions.xml.ko
 share/httpd/manual/mod/mod_actions.xml.meta
+share/httpd/manual/mod/mod_alias.html
 share/httpd/manual/mod/mod_alias.html.en
 share/httpd/manual/mod/mod_alias.html.ja.jis
 share/httpd/manual/mod/mod_alias.xml
 share/httpd/manual/mod/mod_alias.xml.ja
 share/httpd/manual/mod/mod_alias.xml.meta
+share/httpd/manual/mod/mod_asis.html
 share/httpd/manual/mod/mod_asis.html.en
 share/httpd/manual/mod/mod_asis.html.ja.jis
 share/httpd/manual/mod/mod_asis.html.ko.euc-kr
@@ -670,23 +714,29 @@ share/httpd/manual/mod/mod_asis.xml
 share/httpd/manual/mod/mod_asis.xml.ja
 share/httpd/manual/mod/mod_asis.xml.ko
 share/httpd/manual/mod/mod_asis.xml.meta
+share/httpd/manual/mod/mod_auth.html
 share/httpd/manual/mod/mod_auth.html.en
 share/httpd/manual/mod/mod_auth.html.ja.jis
 share/httpd/manual/mod/mod_auth.xml
 share/httpd/manual/mod/mod_auth.xml.ja
 share/httpd/manual/mod/mod_auth.xml.meta
+share/httpd/manual/mod/mod_auth_anon.html
 share/httpd/manual/mod/mod_auth_anon.html.en
 share/httpd/manual/mod/mod_auth_anon.xml
 share/httpd/manual/mod/mod_auth_anon.xml.meta
+share/httpd/manual/mod/mod_auth_dbm.html
 share/httpd/manual/mod/mod_auth_dbm.html.en
 share/httpd/manual/mod/mod_auth_dbm.xml
 share/httpd/manual/mod/mod_auth_dbm.xml.meta
+share/httpd/manual/mod/mod_auth_digest.html
 share/httpd/manual/mod/mod_auth_digest.html.en
 share/httpd/manual/mod/mod_auth_digest.xml
 share/httpd/manual/mod/mod_auth_digest.xml.meta
+share/httpd/manual/mod/mod_auth_ldap.html
 share/httpd/manual/mod/mod_auth_ldap.html.en
 share/httpd/manual/mod/mod_auth_ldap.xml
 share/httpd/manual/mod/mod_auth_ldap.xml.meta
+share/httpd/manual/mod/mod_autoindex.html
 share/httpd/manual/mod/mod_autoindex.html.en
 share/httpd/manual/mod/mod_autoindex.html.ja.jis
 share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
@@ -694,16 +744,19 @@ share/httpd/manual/mod/mod_autoindex.xml
 share/httpd/manual/mod/mod_autoindex.xml.ja
 share/httpd/manual/mod/mod_autoindex.xml.ko
 share/httpd/manual/mod/mod_autoindex.xml.meta
+share/httpd/manual/mod/mod_cache.html
 share/httpd/manual/mod/mod_cache.html.en
 share/httpd/manual/mod/mod_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_cache.xml
 share/httpd/manual/mod/mod_cache.xml.ko
 share/httpd/manual/mod/mod_cache.xml.meta
+share/httpd/manual/mod/mod_cern_meta.html
 share/httpd/manual/mod/mod_cern_meta.html.en
 share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
 share/httpd/manual/mod/mod_cern_meta.xml
 share/httpd/manual/mod/mod_cern_meta.xml.ko
 share/httpd/manual/mod/mod_cern_meta.xml.meta
+share/httpd/manual/mod/mod_cgi.html
 share/httpd/manual/mod/mod_cgi.html.en
 share/httpd/manual/mod/mod_cgi.html.ja.jis
 share/httpd/manual/mod/mod_cgi.html.ko.euc-kr
@@ -711,16 +764,19 @@ share/httpd/manual/mod/mod_cgi.xml
 share/httpd/manual/mod/mod_cgi.xml.ja
 share/httpd/manual/mod/mod_cgi.xml.ko
 share/httpd/manual/mod/mod_cgi.xml.meta
+share/httpd/manual/mod/mod_cgid.html
 share/httpd/manual/mod/mod_cgid.html.en
 share/httpd/manual/mod/mod_cgid.html.ko.euc-kr
 share/httpd/manual/mod/mod_cgid.xml
 share/httpd/manual/mod/mod_cgid.xml.ko
 share/httpd/manual/mod/mod_cgid.xml.meta
+share/httpd/manual/mod/mod_charset_lite.html
 share/httpd/manual/mod/mod_charset_lite.html.en
 share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
 share/httpd/manual/mod/mod_charset_lite.xml
 share/httpd/manual/mod/mod_charset_lite.xml.ko
 share/httpd/manual/mod/mod_charset_lite.xml.meta
+share/httpd/manual/mod/mod_dav.html
 share/httpd/manual/mod/mod_dav.html.en
 share/httpd/manual/mod/mod_dav.html.ja.jis
 share/httpd/manual/mod/mod_dav.html.ko.euc-kr
@@ -728,6 +784,7 @@ share/httpd/manual/mod/mod_dav.xml
 share/httpd/manual/mod/mod_dav.xml.ja
 share/httpd/manual/mod/mod_dav.xml.ko
 share/httpd/manual/mod/mod_dav.xml.meta
+share/httpd/manual/mod/mod_dav_fs.html
 share/httpd/manual/mod/mod_dav_fs.html.en
 share/httpd/manual/mod/mod_dav_fs.html.ja.jis
 share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
@@ -735,6 +792,7 @@ share/httpd/manual/mod/mod_dav_fs.xml
 share/httpd/manual/mod/mod_dav_fs.xml.ja
 share/httpd/manual/mod/mod_dav_fs.xml.ko
 share/httpd/manual/mod/mod_dav_fs.xml.meta
+share/httpd/manual/mod/mod_deflate.html
 share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.html.ja.jis
 share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
@@ -742,6 +800,7 @@ share/httpd/manual/mod/mod_deflate.xml
 share/httpd/manual/mod/mod_deflate.xml.ja
 share/httpd/manual/mod/mod_deflate.xml.ko
 share/httpd/manual/mod/mod_deflate.xml.meta
+share/httpd/manual/mod/mod_dir.html
 share/httpd/manual/mod/mod_dir.html.en
 share/httpd/manual/mod/mod_dir.html.ja.jis
 share/httpd/manual/mod/mod_dir.html.ko.euc-kr
@@ -749,11 +808,13 @@ share/httpd/manual/mod/mod_dir.xml
 share/httpd/manual/mod/mod_dir.xml.ja
 share/httpd/manual/mod/mod_dir.xml.ko
 share/httpd/manual/mod/mod_dir.xml.meta
+share/httpd/manual/mod/mod_disk_cache.html
 share/httpd/manual/mod/mod_disk_cache.html.en
 share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
 share/httpd/manual/mod/mod_disk_cache.xml
 share/httpd/manual/mod/mod_disk_cache.xml.ko
 share/httpd/manual/mod/mod_disk_cache.xml.meta
+share/httpd/manual/mod/mod_echo.html
 share/httpd/manual/mod/mod_echo.html.en
 share/httpd/manual/mod/mod_echo.html.ja.jis
 share/httpd/manual/mod/mod_echo.html.ko.euc-kr
@@ -761,6 +822,7 @@ share/httpd/manual/mod/mod_echo.xml
 share/httpd/manual/mod/mod_echo.xml.ja
 share/httpd/manual/mod/mod_echo.xml.ko
 share/httpd/manual/mod/mod_echo.xml.meta
+share/httpd/manual/mod/mod_env.html
 share/httpd/manual/mod/mod_env.html.en
 share/httpd/manual/mod/mod_env.html.ja.jis
 share/httpd/manual/mod/mod_env.html.ko.euc-kr
@@ -768,127 +830,161 @@ share/httpd/manual/mod/mod_env.xml
 share/httpd/manual/mod/mod_env.xml.ja
 share/httpd/manual/mod/mod_env.xml.ko
 share/httpd/manual/mod/mod_env.xml.meta
+share/httpd/manual/mod/mod_example.html
 share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.xml
 share/httpd/manual/mod/mod_example.xml.meta
+share/httpd/manual/mod/mod_expires.html
 share/httpd/manual/mod/mod_expires.html.en
 share/httpd/manual/mod/mod_expires.xml
 share/httpd/manual/mod/mod_expires.xml.meta
+share/httpd/manual/mod/mod_ext_filter.html
 share/httpd/manual/mod/mod_ext_filter.html.en
 share/httpd/manual/mod/mod_ext_filter.xml
 share/httpd/manual/mod/mod_ext_filter.xml.meta
+share/httpd/manual/mod/mod_file_cache.html
 share/httpd/manual/mod/mod_file_cache.html.en
 share/httpd/manual/mod/mod_file_cache.xml
 share/httpd/manual/mod/mod_file_cache.xml.meta
+share/httpd/manual/mod/mod_headers.html
 share/httpd/manual/mod/mod_headers.html.en
 share/httpd/manual/mod/mod_headers.xml
 share/httpd/manual/mod/mod_headers.xml.meta
+share/httpd/manual/mod/mod_imap.html
 share/httpd/manual/mod/mod_imap.html.en
 share/httpd/manual/mod/mod_imap.xml
 share/httpd/manual/mod/mod_imap.xml.meta
+share/httpd/manual/mod/mod_include.html
 share/httpd/manual/mod/mod_include.html.en
 share/httpd/manual/mod/mod_include.html.ja.jis
 share/httpd/manual/mod/mod_include.xml
 share/httpd/manual/mod/mod_include.xml.ja
 share/httpd/manual/mod/mod_include.xml.meta
+share/httpd/manual/mod/mod_info.html
 share/httpd/manual/mod/mod_info.html.en
 share/httpd/manual/mod/mod_info.html.ja.jis
 share/httpd/manual/mod/mod_info.xml
 share/httpd/manual/mod/mod_info.xml.ja
 share/httpd/manual/mod/mod_info.xml.meta
+share/httpd/manual/mod/mod_isapi.html
 share/httpd/manual/mod/mod_isapi.html.en
 share/httpd/manual/mod/mod_isapi.xml
 share/httpd/manual/mod/mod_isapi.xml.meta
+share/httpd/manual/mod/mod_ldap.html
 share/httpd/manual/mod/mod_ldap.html.en
 share/httpd/manual/mod/mod_ldap.xml
 share/httpd/manual/mod/mod_ldap.xml.meta
+share/httpd/manual/mod/mod_log_config.html
 share/httpd/manual/mod/mod_log_config.html.en
 share/httpd/manual/mod/mod_log_config.xml
 share/httpd/manual/mod/mod_log_config.xml.meta
+share/httpd/manual/mod/mod_logio.html
 share/httpd/manual/mod/mod_logio.html.en
 share/httpd/manual/mod/mod_logio.xml
 share/httpd/manual/mod/mod_logio.xml.meta
+share/httpd/manual/mod/mod_mem_cache.html
 share/httpd/manual/mod/mod_mem_cache.html.en
 share/httpd/manual/mod/mod_mem_cache.xml
 share/httpd/manual/mod/mod_mem_cache.xml.meta
+share/httpd/manual/mod/mod_mime.html
 share/httpd/manual/mod/mod_mime.html.en
 share/httpd/manual/mod/mod_mime.html.ja.jis
 share/httpd/manual/mod/mod_mime.xml
 share/httpd/manual/mod/mod_mime.xml.ja
 share/httpd/manual/mod/mod_mime.xml.meta
+share/httpd/manual/mod/mod_mime_magic.html
 share/httpd/manual/mod/mod_mime_magic.html.en
 share/httpd/manual/mod/mod_mime_magic.xml
 share/httpd/manual/mod/mod_mime_magic.xml.meta
+share/httpd/manual/mod/mod_negotiation.html
 share/httpd/manual/mod/mod_negotiation.html.en
 share/httpd/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/manual/mod/mod_negotiation.xml
 share/httpd/manual/mod/mod_negotiation.xml.ja
 share/httpd/manual/mod/mod_negotiation.xml.meta
+share/httpd/manual/mod/mod_nw_ssl.html
 share/httpd/manual/mod/mod_nw_ssl.html.en
 share/httpd/manual/mod/mod_nw_ssl.xml
 share/httpd/manual/mod/mod_nw_ssl.xml.meta
+share/httpd/manual/mod/mod_proxy.html
 share/httpd/manual/mod/mod_proxy.html.en
 share/httpd/manual/mod/mod_proxy.xml
 share/httpd/manual/mod/mod_proxy.xml.meta
+share/httpd/manual/mod/mod_proxy_connect.html
 share/httpd/manual/mod/mod_proxy_connect.html.en
 share/httpd/manual/mod/mod_proxy_connect.xml
 share/httpd/manual/mod/mod_proxy_connect.xml.meta
+share/httpd/manual/mod/mod_proxy_ftp.html
 share/httpd/manual/mod/mod_proxy_ftp.html.en
 share/httpd/manual/mod/mod_proxy_ftp.xml
 share/httpd/manual/mod/mod_proxy_ftp.xml.meta
+share/httpd/manual/mod/mod_proxy_http.html
 share/httpd/manual/mod/mod_proxy_http.html.en
 share/httpd/manual/mod/mod_proxy_http.xml
 share/httpd/manual/mod/mod_proxy_http.xml.meta
+share/httpd/manual/mod/mod_rewrite.html
 share/httpd/manual/mod/mod_rewrite.html.en
 share/httpd/manual/mod/mod_rewrite.xml
 share/httpd/manual/mod/mod_rewrite.xml.meta
+share/httpd/manual/mod/mod_setenvif.html
 share/httpd/manual/mod/mod_setenvif.html.en
 share/httpd/manual/mod/mod_setenvif.html.ja.jis
 share/httpd/manual/mod/mod_setenvif.xml
 share/httpd/manual/mod/mod_setenvif.xml.ja
 share/httpd/manual/mod/mod_setenvif.xml.meta
+share/httpd/manual/mod/mod_so.html
 share/httpd/manual/mod/mod_so.html.en
 share/httpd/manual/mod/mod_so.html.ja.jis
 share/httpd/manual/mod/mod_so.xml
 share/httpd/manual/mod/mod_so.xml.ja
 share/httpd/manual/mod/mod_so.xml.meta
+share/httpd/manual/mod/mod_speling.html
 share/httpd/manual/mod/mod_speling.html.en
 share/httpd/manual/mod/mod_speling.html.ja.jis
 share/httpd/manual/mod/mod_speling.xml
 share/httpd/manual/mod/mod_speling.xml.ja
 share/httpd/manual/mod/mod_speling.xml.meta
+share/httpd/manual/mod/mod_ssl.html
 share/httpd/manual/mod/mod_ssl.html.en
 share/httpd/manual/mod/mod_ssl.xml
 share/httpd/manual/mod/mod_ssl.xml.meta
+share/httpd/manual/mod/mod_status.html
 share/httpd/manual/mod/mod_status.html.en
 share/httpd/manual/mod/mod_status.xml
 share/httpd/manual/mod/mod_status.xml.meta
+share/httpd/manual/mod/mod_suexec.html
 share/httpd/manual/mod/mod_suexec.html.en
 share/httpd/manual/mod/mod_suexec.html.ja.jis
 share/httpd/manual/mod/mod_suexec.xml
 share/httpd/manual/mod/mod_suexec.xml.ja
 share/httpd/manual/mod/mod_suexec.xml.meta
+share/httpd/manual/mod/mod_unique_id.html
 share/httpd/manual/mod/mod_unique_id.html.en
 share/httpd/manual/mod/mod_unique_id.html.ja.jis
 share/httpd/manual/mod/mod_unique_id.xml
 share/httpd/manual/mod/mod_unique_id.xml.ja
 share/httpd/manual/mod/mod_unique_id.xml.meta
+share/httpd/manual/mod/mod_userdir.html
 share/httpd/manual/mod/mod_userdir.html.en
 share/httpd/manual/mod/mod_userdir.html.ja.jis
 share/httpd/manual/mod/mod_userdir.xml
 share/httpd/manual/mod/mod_userdir.xml.ja
 share/httpd/manual/mod/mod_userdir.xml.meta
+share/httpd/manual/mod/mod_usertrack.html
 share/httpd/manual/mod/mod_usertrack.html.en
 share/httpd/manual/mod/mod_usertrack.xml
 share/httpd/manual/mod/mod_usertrack.xml.meta
+share/httpd/manual/mod/mod_vhost_alias.html
 share/httpd/manual/mod/mod_vhost_alias.html.en
 share/httpd/manual/mod/mod_vhost_alias.xml
 share/httpd/manual/mod/mod_vhost_alias.xml.meta
+share/httpd/manual/mod/module-dict.html
 share/httpd/manual/mod/module-dict.html.en
 share/httpd/manual/mod/module-dict.html.ja.jis
 share/httpd/manual/mod/module-dict.xml
 share/httpd/manual/mod/module-dict.xml.ja
 share/httpd/manual/mod/module-dict.xml.meta
+share/httpd/manual/mod/mpm_common.html
 share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
 share/httpd/manual/mod/mpm_common.html.ja.jis
@@ -896,9 +992,11 @@ share/httpd/manual/mod/mpm_common.xml
 share/httpd/manual/mod/mpm_common.xml.de
 share/httpd/manual/mod/mpm_common.xml.ja
 share/httpd/manual/mod/mpm_common.xml.meta
+share/httpd/manual/mod/mpm_netware.html
 share/httpd/manual/mod/mpm_netware.html.en
 share/httpd/manual/mod/mpm_netware.xml
 share/httpd/manual/mod/mpm_netware.xml.meta
+share/httpd/manual/mod/mpm_winnt.html
 share/httpd/manual/mod/mpm_winnt.html.de
 share/httpd/manual/mod/mpm_winnt.html.en
 share/httpd/manual/mod/mpm_winnt.html.ja.jis
@@ -906,12 +1004,15 @@ share/httpd/manual/mod/mpm_winnt.xml
 share/httpd/manual/mod/mpm_winnt.xml.de
 share/httpd/manual/mod/mpm_winnt.xml.ja
 share/httpd/manual/mod/mpm_winnt.xml.meta
+share/httpd/manual/mod/mpmt_os2.html
 share/httpd/manual/mod/mpmt_os2.html.en
 share/httpd/manual/mod/mpmt_os2.xml
 share/httpd/manual/mod/mpmt_os2.xml.meta
+share/httpd/manual/mod/perchild.html
 share/httpd/manual/mod/perchild.html.en
 share/httpd/manual/mod/perchild.xml
 share/httpd/manual/mod/perchild.xml.meta
+share/httpd/manual/mod/prefork.html
 share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
 share/httpd/manual/mod/prefork.html.ja.jis
@@ -919,6 +1020,7 @@ share/httpd/manual/mod/prefork.xml
 share/httpd/manual/mod/prefork.xml.de
 share/httpd/manual/mod/prefork.xml.ja
 share/httpd/manual/mod/prefork.xml.meta
+share/httpd/manual/mod/quickreference.html
 share/httpd/manual/mod/quickreference.html.de
 share/httpd/manual/mod/quickreference.html.en
 share/httpd/manual/mod/quickreference.html.ja.jis
@@ -928,9 +1030,11 @@ share/httpd/manual/mod/quickreference.xml.de
 share/httpd/manual/mod/quickreference.xml.ja
 share/httpd/manual/mod/quickreference.xml.meta
 share/httpd/manual/mod/quickreference.xml.ru
+share/httpd/manual/mod/threadpool.html
 share/httpd/manual/mod/threadpool.html.en
 share/httpd/manual/mod/threadpool.xml
 share/httpd/manual/mod/threadpool.xml.meta
+share/httpd/manual/mod/worker.html
 share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
 share/httpd/manual/mod/worker.html.ja.jis
@@ -938,6 +1042,7 @@ share/httpd/manual/mod/worker.xml
 share/httpd/manual/mod/worker.xml.de
 share/httpd/manual/mod/worker.xml.ja
 share/httpd/manual/mod/worker.xml.meta
+share/httpd/manual/mpm.html
 share/httpd/manual/mpm.html.en
 share/httpd/manual/mpm.html.ja.jis
 share/httpd/manual/mpm.html.ko.euc-kr
@@ -947,6 +1052,7 @@ share/httpd/manual/mpm.xml.ja
 share/httpd/manual/mpm.xml.ko
 share/httpd/manual/mpm.xml.meta
 share/httpd/manual/mpm.xml.ru
+share/httpd/manual/new_features_2_0.html
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
 share/httpd/manual/new_features_2_0.html.fr
@@ -959,61 +1065,80 @@ share/httpd/manual/new_features_2_0.xml.ja
 share/httpd/manual/new_features_2_0.xml.ko
 share/httpd/manual/new_features_2_0.xml.meta
 share/httpd/manual/new_features_2_0.xml.ru
+share/httpd/manual/platform/ebcdic.html
 share/httpd/manual/platform/ebcdic.html.en
 share/httpd/manual/platform/ebcdic.xml
 share/httpd/manual/platform/ebcdic.xml.meta
+share/httpd/manual/platform/index.html
 share/httpd/manual/platform/index.html.en
 share/httpd/manual/platform/index.xml
 share/httpd/manual/platform/index.xml.meta
+share/httpd/manual/platform/netware.html
 share/httpd/manual/platform/netware.html.en
 share/httpd/manual/platform/netware.xml
 share/httpd/manual/platform/netware.xml.meta
+share/httpd/manual/platform/perf-hp.html
 share/httpd/manual/platform/perf-hp.html.en
 share/httpd/manual/platform/perf-hp.xml
 share/httpd/manual/platform/perf-hp.xml.meta
+share/httpd/manual/platform/win_compiling.html
 share/httpd/manual/platform/win_compiling.html.en
 share/httpd/manual/platform/win_compiling.xml
 share/httpd/manual/platform/win_compiling.xml.meta
+share/httpd/manual/platform/windows.html
 share/httpd/manual/platform/windows.html.en
 share/httpd/manual/platform/windows.xml
 share/httpd/manual/platform/windows.xml.meta
+share/httpd/manual/programs/ab.html
 share/httpd/manual/programs/ab.html.en
 share/httpd/manual/programs/ab.xml
 share/httpd/manual/programs/ab.xml.meta
+share/httpd/manual/programs/apachectl.html
 share/httpd/manual/programs/apachectl.html.en
 share/httpd/manual/programs/apachectl.xml
 share/httpd/manual/programs/apachectl.xml.meta
+share/httpd/manual/programs/apxs.html
 share/httpd/manual/programs/apxs.html.en
 share/httpd/manual/programs/apxs.xml
 share/httpd/manual/programs/apxs.xml.meta
+share/httpd/manual/programs/dbmmanage.html
 share/httpd/manual/programs/dbmmanage.html.en
 share/httpd/manual/programs/dbmmanage.xml
 share/httpd/manual/programs/dbmmanage.xml.meta
+share/httpd/manual/programs/htdigest.html
 share/httpd/manual/programs/htdigest.html.en
 share/httpd/manual/programs/htdigest.xml
 share/httpd/manual/programs/htdigest.xml.meta
+share/httpd/manual/programs/htpasswd.html
 share/httpd/manual/programs/htpasswd.html.en
 share/httpd/manual/programs/htpasswd.xml
 share/httpd/manual/programs/htpasswd.xml.meta
+share/httpd/manual/programs/httpd.html
 share/httpd/manual/programs/httpd.html.en
 share/httpd/manual/programs/httpd.xml
 share/httpd/manual/programs/httpd.xml.meta
+share/httpd/manual/programs/index.html
 share/httpd/manual/programs/index.html.en
 share/httpd/manual/programs/index.xml
 share/httpd/manual/programs/index.xml.meta
+share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
 share/httpd/manual/programs/logresolve.xml
 share/httpd/manual/programs/logresolve.xml.meta
+share/httpd/manual/programs/other.html
 share/httpd/manual/programs/other.html.en
 share/httpd/manual/programs/other.xml
 share/httpd/manual/programs/other.xml.meta
+share/httpd/manual/programs/rotatelogs.html
 share/httpd/manual/programs/rotatelogs.html.en
 share/httpd/manual/programs/rotatelogs.xml
 share/httpd/manual/programs/rotatelogs.xml.meta
+share/httpd/manual/programs/suexec.html
 share/httpd/manual/programs/suexec.html.en
 share/httpd/manual/programs/suexec.xml
 share/httpd/manual/programs/suexec.xml.meta
 share/httpd/manual/search/manual-index.cgi
+share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.jis
 share/httpd/manual/sections.html.ko.euc-kr
@@ -1021,6 +1146,7 @@ share/httpd/manual/sections.xml
 share/httpd/manual/sections.xml.ja
 share/httpd/manual/sections.xml.ko
 share/httpd/manual/sections.xml.meta
+share/httpd/manual/server-wide.html
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.ja.jis
 share/httpd/manual/server-wide.html.ko.euc-kr
@@ -1028,6 +1154,7 @@ share/httpd/manual/server-wide.xml
 share/httpd/manual/server-wide.xml.ja
 share/httpd/manual/server-wide.xml.ko
 share/httpd/manual/server-wide.xml.meta
+share/httpd/manual/sitemap.html
 share/httpd/manual/sitemap.html.de
 share/httpd/manual/sitemap.html.en
 share/httpd/manual/sitemap.html.ja.jis
@@ -1037,27 +1164,32 @@ share/httpd/manual/sitemap.xml.de
 share/httpd/manual/sitemap.xml.ja
 share/httpd/manual/sitemap.xml.ko
 share/httpd/manual/sitemap.xml.meta
+share/httpd/manual/ssl/index.html
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.ja.jis
 share/httpd/manual/ssl/index.xml
 share/httpd/manual/ssl/index.xml.ja
 share/httpd/manual/ssl/index.xml.meta
+share/httpd/manual/ssl/ssl_compat.html
 share/httpd/manual/ssl/ssl_compat.html.en
 share/httpd/manual/ssl/ssl_compat.xml
 share/httpd/manual/ssl/ssl_compat.xml.meta
+share/httpd/manual/ssl/ssl_faq.html
 share/httpd/manual/ssl/ssl_faq.html.en
 share/httpd/manual/ssl/ssl_faq.xml
 share/httpd/manual/ssl/ssl_faq.xml.meta
+share/httpd/manual/ssl/ssl_howto.html
 share/httpd/manual/ssl/ssl_howto.html.en
 share/httpd/manual/ssl/ssl_howto.xml
 share/httpd/manual/ssl/ssl_howto.xml.meta
+share/httpd/manual/ssl/ssl_intro.html
 share/httpd/manual/ssl/ssl_intro.html.en
 share/httpd/manual/ssl/ssl_intro.xml
 share/httpd/manual/ssl/ssl_intro.xml.meta
 share/httpd/manual/ssl/ssl_intro_fig1.gif
 share/httpd/manual/ssl/ssl_intro_fig2.gif
 share/httpd/manual/ssl/ssl_intro_fig3.gif
-share/httpd/manual/ssl/ssl_overview_fig1.gif
+share/httpd/manual/stopping.html
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
 share/httpd/manual/stopping.html.ja.jis
@@ -1090,6 +1222,8 @@ share/httpd/manual/style/common.dtd
 share/httpd/manual/style/css/manual-chm.css
 share/httpd/manual/style/css/manual-loose-100pc.css
 share/httpd/manual/style/css/manual-print.css
+share/httpd/manual/style/css/manual-zip-100pc.css
+share/httpd/manual/style/css/manual-zip.css
 share/httpd/manual/style/css/manual.css
 share/httpd/manual/style/faq.dtd
 share/httpd/manual/style/lang/de.xml
@@ -1098,10 +1232,21 @@ share/httpd/manual/style/lang/ja.xml
 share/httpd/manual/style/lang/ko.xml
 share/httpd/manual/style/lang/ru.xml
 share/httpd/manual/style/lang/sv.xml
+share/httpd/manual/style/latex/atbeginend.sty
+share/httpd/manual/style/latex/common.xsl
+share/httpd/manual/style/latex/directiveindex.xsl
+share/httpd/manual/style/latex/faq.xsl
+share/httpd/manual/style/latex/html.xsl
+share/httpd/manual/style/latex/latex.xsl
+share/httpd/manual/style/latex/manualpage.xsl
+share/httpd/manual/style/latex/moduleindex.xsl
+share/httpd/manual/style/latex/quickreference.xsl
+share/httpd/manual/style/latex/synopsis.xsl
 share/httpd/manual/style/man/man.en.xsl
 share/httpd/manual/style/man/manpage.xsl
 share/httpd/manual/style/manual.de.xsl
 share/httpd/manual/style/manual.en.xsl
+share/httpd/manual/style/manual.fr.xsl
 share/httpd/manual/style/manual.ja.xsl
 share/httpd/manual/style/manual.ko.xsl
 share/httpd/manual/style/manual.pt-br.xsl
@@ -1125,6 +1270,7 @@ share/httpd/manual/style/xsl/moduleindex.xsl
 share/httpd/manual/style/xsl/quickreference.xsl
 share/httpd/manual/style/xsl/sitemap.xsl
 share/httpd/manual/style/xsl/synopsis.xsl
+share/httpd/manual/style/xsl/typemap.xsl
 share/httpd/manual/style/xsl/util/lf.xml
 share/httpd/manual/style/xsl/util/li-end.xml
 share/httpd/manual/style/xsl/util/li-start.xml
@@ -1133,6 +1279,8 @@ share/httpd/manual/style/xsl/util/nbsp.xml
 share/httpd/manual/style/xsl/util/tab.xml
 share/httpd/manual/style/xsl/util/ul-end.xml
 share/httpd/manual/style/xsl/util/ul-start.xml
+share/httpd/manual/style/zip/zip.en.xsl
+share/httpd/manual/suexec.html
 share/httpd/manual/suexec.html.en
 share/httpd/manual/suexec.html.ja.jis
 share/httpd/manual/suexec.html.ko.euc-kr
@@ -1140,6 +1288,7 @@ share/httpd/manual/suexec.xml
 share/httpd/manual/suexec.xml.ja
 share/httpd/manual/suexec.xml.ko
 share/httpd/manual/suexec.xml.meta
+share/httpd/manual/upgrading.html
 share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr
@@ -1152,6 +1301,7 @@ share/httpd/manual/upgrading.xml.ja
 share/httpd/manual/upgrading.xml.ko
 share/httpd/manual/upgrading.xml.meta
 share/httpd/manual/upgrading.xml.ru
+share/httpd/manual/urlmapping.html
 share/httpd/manual/urlmapping.html.en
 share/httpd/manual/urlmapping.html.ja.jis
 share/httpd/manual/urlmapping.html.ko.euc-kr
@@ -1159,16 +1309,19 @@ share/httpd/manual/urlmapping.xml
 share/httpd/manual/urlmapping.xml.ja
 share/httpd/manual/urlmapping.xml.ko
 share/httpd/manual/urlmapping.xml.meta
+share/httpd/manual/vhosts/details.html
 share/httpd/manual/vhosts/details.html.en
 share/httpd/manual/vhosts/details.html.ko.euc-kr
 share/httpd/manual/vhosts/details.xml
 share/httpd/manual/vhosts/details.xml.ko
 share/httpd/manual/vhosts/details.xml.meta
+share/httpd/manual/vhosts/examples.html
 share/httpd/manual/vhosts/examples.html.en
 share/httpd/manual/vhosts/examples.html.ko.euc-kr
 share/httpd/manual/vhosts/examples.xml
 share/httpd/manual/vhosts/examples.xml.ko
 share/httpd/manual/vhosts/examples.xml.meta
+share/httpd/manual/vhosts/fd-limits.html
 share/httpd/manual/vhosts/fd-limits.html.en
 share/httpd/manual/vhosts/fd-limits.html.ja.jis
 share/httpd/manual/vhosts/fd-limits.html.ko.euc-kr
@@ -1176,6 +1329,7 @@ share/httpd/manual/vhosts/fd-limits.xml
 share/httpd/manual/vhosts/fd-limits.xml.ja
 share/httpd/manual/vhosts/fd-limits.xml.ko
 share/httpd/manual/vhosts/fd-limits.xml.meta
+share/httpd/manual/vhosts/index.html
 share/httpd/manual/vhosts/index.html.de
 share/httpd/manual/vhosts/index.html.en
 share/httpd/manual/vhosts/index.html.ja.jis
@@ -1185,20 +1339,25 @@ share/httpd/manual/vhosts/index.xml.de
 share/httpd/manual/vhosts/index.xml.ja
 share/httpd/manual/vhosts/index.xml.ko
 share/httpd/manual/vhosts/index.xml.meta
+share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/ip-based.html.en
 share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
 share/httpd/manual/vhosts/ip-based.xml
 share/httpd/manual/vhosts/ip-based.xml.ko
 share/httpd/manual/vhosts/ip-based.xml.meta
+share/httpd/manual/vhosts/mass.html
 share/httpd/manual/vhosts/mass.html.en
 share/httpd/manual/vhosts/mass.html.ko.euc-kr
 share/httpd/manual/vhosts/mass.xml
 share/httpd/manual/vhosts/mass.xml.ko
 share/httpd/manual/vhosts/mass.xml.meta
+share/httpd/manual/vhosts/name-based.html
+share/httpd/manual/vhosts/name-based.html.de
 share/httpd/manual/vhosts/name-based.html.en
 share/httpd/manual/vhosts/name-based.html.ja.jis
 share/httpd/manual/vhosts/name-based.html.ko.euc-kr
 share/httpd/manual/vhosts/name-based.xml
+share/httpd/manual/vhosts/name-based.xml.de
 share/httpd/manual/vhosts/name-based.xml.ko
 share/httpd/manual/vhosts/name-based.xml.meta
 @dirrm share/httpd/manual/developer
@@ -1211,10 +1370,12 @@ share/httpd/manual/vhosts/name-based.xml.meta
 @dirrm share/httpd/manual/programs
 @dirrm share/httpd/manual/search
 @dirrm share/httpd/manual/ssl
+@dirrm share/httpd/manual/style/zip
 @dirrm share/httpd/manual/style/xsl/util
 @dirrm share/httpd/manual/style/xsl
 @dirrm share/httpd/manual/style/w3c
 @dirrm share/httpd/manual/style/man
+@dirrm share/httpd/manual/style/latex
 @dirrm share/httpd/manual/style/lang
 @dirrm share/httpd/manual/style/css
 @dirrm share/httpd/manual/style/chm
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 445540e2d97..f5184067873 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2003/07/02 17:58:42 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2003/07/09 08:09:06 itojun Exp $
 
-SHA1 (httpd-2.0.46.tar.gz) = c739c4c296054697e264f7d1ac19f9f1e2d47553
-Size (httpd-2.0.46.tar.gz) = 6031023 bytes
+SHA1 (httpd-2.0.47.tar.gz) = dbbb06472ddc65cbc59028e42d4476b186275632
+Size (httpd-2.0.47.tar.gz) = 6217401 bytes
 SHA1 (patch-aa) = 2b7a2c0db5abac66966eaea2efb8609843e8abf4
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01