Commit 62d3a449 authored by Joshua Slive's avatar Joshua Slive
Browse files

Move the config for the users manual to extra/. 

Yes, this means you need to know how to edit the config
in order to learn how to edit the config.  But you already
need to know how to start and install the server before
you can get to the manual.

Most people should probably be using alternative documentation
forms anyway (online, off-browsable single-language tarballs,
windows help, etc).

Also, clean up a few comments in the extra config section.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160079 13f79535-47bb-0310-9956-ffa450edef68
parent 624588d8

docs/conf/extra/httpd-manual.conf.in

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#

# Provide access to the documentation on your server as

#  http://yourserver.example.com/manual/

# The documentation is always available at

#  http://httpd.apache.org/docs-2.1/

#

# Required modules: mod_alias, mod_setenvif, mod_negotiation

#



AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "@exp_manualdir@$1"



<Directory "@exp_manualdir@">

    Options Indexes

    AllowOverride None

    Order allow,deny

    Allow from all



    <Files *.html>

        SetHandler type-map

    </Files>



    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1

    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2



    LanguagePriority en de es fr ja ko pt-br ru 

    ForceLanguagePriority Prefer Fallback

</Directory>

docs/conf/httpd.conf.in

+16 −37
Original line number Diff line number Diff line
@@ -318,32 +318,6 @@ LogLevel warn 
    # need to provide a <Directory> section to allow access to

    # the filesystem path.



    #

    # This should be changed to the ServerRoot/manual/.  The alias provides

    # the manual, even if you choose to move your DocumentRoot.  You may

    # comment this out if you do not care for the documentation.

    #

    AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \

        "@exp_manualdir@$1"



    <Directory "@exp_manualdir@">

        Options Indexes

        AllowOverride None

        Order allow,deny

        Allow from all



        <Files *.html>

            SetHandler type-map

        </Files>



        SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1

        RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2



        LanguagePriority en de es fr ja ko pt-br ru 

        ForceLanguagePriority Prefer Fallback



    </Directory>



    #

    # ScriptAlias: This controls which directories contain server scripts. 

    # ScriptAliases are essentially the same as Aliases, except that
@@ -480,8 +454,8 @@ LogLevel warn 
### Section 3: Supplemental configuration

#

# The configuration files in the @rel_sysconfdir@/extra/ directory can be included

# to add extra features, or you may simply copy their contents

# here and change as necessary.

# to add extra features or modify the default configuration of the server, 

# or you may simply copy their contents here and change as necessary.



# Server-Pool Size Regulation (MPM specific)

#Include @rel_sysconfdir@/extra/httpd-mpm.conf
@@ -504,7 +478,12 @@ LogLevel warn 
# Virtual hosts

#Include @rel_sysconfdir@/extra/httpd-vhosts.conf



#

# Local access to the Apache HTTP Server Manual

#Include @rel_sysconfdir@/extra/httpd-manual.conf



# Various default settings

#Include @rel_sysconfdir@/extra/httpd-default.conf



# Secure (SSL/TLS) connections

#Include @rel_sysconfdir@/extra/httpd-ssl.conf

#