]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merged the simple-conf branch changes r159781:160695 into the trunk.
authorJoshua Slive <slive@apache.org>
Sat, 9 Apr 2005 16:59:15 +0000 (16:59 +0000)
committerJoshua Slive <slive@apache.org>
Sat, 9 Apr 2005 16:59:15 +0000 (16:59 +0000)
commitfa4e8666003806970b6ef033d8d867f7a1ec0d89
treec03851a209dd2d280d7061ac7770fecb900b9a1b
parentd13b2de6e2e43932ae5ab74fc270961d205e011b
Merged the simple-conf branch changes r159781:160695 into the trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
21 files changed:
Makefile.in
configure.in
docs/conf/extra/httpd-autoindex.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-dav.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-default.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-info.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-languages.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-manual.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-mpm.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-multilang-errordoc.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-ssl.conf.in [moved from docs/conf/ssl-std.conf.in with 97% similarity]
docs/conf/extra/httpd-userdir.conf.in [new file with mode: 0644]
docs/conf/extra/httpd-vhosts.conf.in [new file with mode: 0644]
docs/conf/highperformance-std.conf [deleted file]
docs/conf/httpd-std.conf.in [deleted file]
docs/conf/httpd.conf.in [new file with mode: 0644]
docs/manual/mod/core.xml
docs/manual/mod/mod_userdir.xml
modules/mappers/mod_userdir.c
server/core.c
support/apachectl.in