1 files changed, 22 insertions, 17 deletions

diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc
index d22f0d3d5709..889cbaac3801 100644
--- a/www/apache20/Makefile.doc
+++ b/www/apache20/Makefile.doc
@@ -11,25 +11,28 @@
 ## Available knobs:
 ## By default, modules are compiled as dynamically loadable (DSO) modules.
 ##
+## Modules knobs philosophy:
+## Modules are split in categories, "make show-categories" shows you 
+## which modules they contain. You can enable/disable/customize a category:
+## - To enable a category: WITH_<CATEGORY>_MODULES=yes
+##                            [WITH_PROXY_MODULES=yes]
+## - To disable a category: WITHOUT_<CATEGORY>_MODULES=yes 
+##                            [WITHOUT_DAV_MODULES=yes]
+## - To customize a category: WITH_CUSTOM_<CATEGORY>
+##                            [WITH_CUSTOM_PROXY="proxy proxy_http"]
+##
 ##   Apache-related
 ##      WITH_MPM:                 prefork (default)
 ##                                worker
 ##                                perchild (deprecated)
 ##                                threadpool (testing purpose only)
 ##      WITH_HTTP_PORT:           default: 80
-##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap)
-##      WITHOUT_PROXY:            Disable proxy support
-##          WITH_CUSTOM_PROXY:    Let you choose which proxy modules you wish
-##      WITHOUT_AUTH:             Disable auth modules
-##          WITH_CUSTOM_AUTH:     Let you choose which auth modules you wish
-##      WITHOUT_DAV:              Disable DAV support
-##      WITHOUT_IPV6:             Disable IPv6 support
+##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap) (implies WITH_LDAP_MODULES)
 ##      WITHOUT_V4MAPPED
 ##      WITH_IPV6_V6ONLY:         Don't allow IPv6 sockets to handle IPv4 
 ##                                connections
 ##      WITHOUT_SSL:              Disable SSL support
 ##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
-##           WITH_CUSTOM_THREADS: Let you choose which threaded modules you want
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
 ##                                ndbm (default)
 ##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3,
@@ -44,11 +47,8 @@
 ##                                WITH_MODULES or with default configuration
 ##                                use 'make show-modules', to check if they are
 ##                                enabled)
-##      WITH_EXPERIMENTAL:        Build and install experimental modules
-##      WITH_EXTRA_MODULES:       Use this to support additional modules (plist
-##                                entry is NOT yet supported)
-##      WITH_MODULES:             List of your own modules
-##      WITHOUT_MODULES:          Disable listed modules
+##      WITH_MODULES:             List of modules you choose
+##      WITHOUT_MODULES:          Disable selected modules
 ##      WITH_SUEXEC:              Enable suExec support
 ##            SUEXEC_DOCROOT:     SuExec root directory
 ##            SUEXEC_USERDIR:     User subdirectory (default public_html)
@@ -73,16 +73,21 @@
 ##      WITH_APR_FROM_PORTS:      Utilise apr and apr-utils from 
 ##                                ${PORTSDIR}/devel/apr
 ##
+##  Optionnal patches:  
+##      WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported
+##                                from apr/httpd CVS)
+##      WITH_WINDOWSUPDATEFIX     Add a fix to use apache as proxy with 
+##                                Windows Update service.
+##
 ## Available make targets:
 ##      show-options:             prints this message
 ##      show-modules:             prints list of available modules
+##      show-categories:          prints list of modules sorted by category
 ##
 ## Examples:
-##      make WITHOUT_SSL=yes WITH_EXTRA_MODULES="bucketeer case_filter \
-##           case_filter_in" WITHOUT_PROXY=yes
-##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL=yes \
+##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL_MODULES=yes \
 ##           WITH_CUSTOM_AUTH="auth auth_dbm"
-##      make WITH_EXPERIMENTAL=yes WITHOUT_MODULES="access speling status"
+##      make WITHOUT_MODULES="access speling status" WITH_PROXY_MODULES=yes
 ##      make WITH_MODULES="include rewrite auth"
 ##