Commit 888624e7 authored by Andre Malo's avatar Andre Malo
Browse files

centralize the versioning of the httpd and the docs directories 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@333005 13f79535-47bb-0310-9956-ffa450edef68
parent 0295236f

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# 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/

#  http://httpd.apache.org/docs/trunk/

#

# Required modules: mod_alias, mod_setenvif, mod_negotiation

#

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# This is the Apache server configuration file providing SSL support.

# It contains the configuration directives to instruct the server how to

# serve pages over an https connection. For detailing information about these 

# directives see <URL:http://httpd.apache.org/docs-2.1/mod/mod_ssl.html>

# directives see <URL:http://httpd.apache.org/docs/trunk/mod/mod_ssl.html>

# 

# Do NOT simply read the instructions in here without understanding

# what they do.  They're here only as hints or reminders.  If you are unsure

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
# IP addresses. This is indicated by the asterisks in the directives below.

#

# Please see the documentation at 

# <URL:http://httpd.apache.org/docs-2.1/vhosts/>

# <URL:http://httpd.apache.org/docs/trunk/vhosts/>

# for further details before you try to setup virtual hosts.

#

# You may use the command line option '-S' to verify your virtual host

docs/conf/httpd-win.conf

+3 −3
Original line number Diff line number Diff line 
#

# This is the main Apache HTTP server configuration file.  It contains the

# configuration directives that give the server its instructions.

# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.

# See <URL:http://httpd.apache.org/docs/trunk/> for detailed information.

# In particular, see 

# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>

# <URL:http://httpd.apache.org/docs/trunk/mod/directives.html>

# for a discussion of each configuration directive.

#

# Do NOT simply read the instructions in here without understanding
@@ -183,7 +183,7 @@ DocumentRoot "@@ServerRoot@@/htdocs" 
    # doesn't give it to you.

    #

    # The Options directive is both complicated and important.  Please see

    # http://httpd.apache.org/docs-2.1/mod/core.html#options

    # http://httpd.apache.org/docs/trunk/mod/core.html#options

    # for more information.

    #

    Options Indexes FollowSymLinks

docs/conf/httpd.conf.in

+3 −3
Original line number Diff line number Diff line 
#

# This is the main Apache HTTP server configuration file.  It contains the

# configuration directives that give the server its instructions.

# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.

# See <URL:http://httpd.apache.org/docs/trunk/> for detailed information.

# In particular, see 

# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>

# <URL:http://httpd.apache.org/docs/trunk/mod/directives.html>

# for a discussion of each configuration directive.

#

# Do NOT simply read the instructions in here without understanding
@@ -138,7 +138,7 @@ DocumentRoot "@exp_htdocsdir@" 
    # doesn't give it to you.

    #

    # The Options directive is both complicated and important.  Please see

    # http://httpd.apache.org/docs-2.1/mod/core.html#options

    # http://httpd.apache.org/docs/trunk/mod/core.html#options

    # for more information.

    #

    Options Indexes FollowSymLinks