From 32fd3068f210f8c6d0e2e45339c83bc0da0338a9 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Mon, 20 Feb 2012 15:22:16 +0000 Subject: [PATCH] Switch documentation links nconfiguration templates from trunk to 2.4. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1291307 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ README | 2 +- docs/conf/extra/httpd-manual.conf.in | 2 +- docs/conf/extra/httpd-ssl.conf.in | 2 +- docs/conf/extra/httpd-vhosts.conf.in | 2 +- docs/conf/httpd.conf.in | 6 +++--- docs/man/tr/suexec.8 | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 943bf0c34f..2fdb627fd9 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ Changes with Apache 2.4.2 Changes with Apache 2.4.2 + *) Configuration: Switch documentation links from trunk to 2.4. + [Rainer Jung] + *) configure: Fix out of tree build using apr and apr-util in srclib. [Rainer Jung] diff --git a/README b/README index a253c79acd..374e948aa6 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ The documentation available as of the date of this release is included in HTML format in the docs/manual/ directory. The most up-to-date documentation can be found at - http://httpd.apache.org/docs/trunk/. + http://httpd.apache.org/docs/2.4/. Installation ------------ diff --git a/docs/conf/extra/httpd-manual.conf.in b/docs/conf/extra/httpd-manual.conf.in index 29b1094c1f..d5c7c47535 100644 --- a/docs/conf/extra/httpd-manual.conf.in +++ b/docs/conf/extra/httpd-manual.conf.in @@ -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/trunk/ +# http://httpd.apache.org/docs/2.4/ # # Required modules: mod_alias, mod_authz_core, mod_authz_host, # mod_setenvif, mod_negotiation diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in index 1e822a31a1..673d1aa816 100644 --- a/docs/conf/extra/httpd-ssl.conf.in +++ b/docs/conf/extra/httpd-ssl.conf.in @@ -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 detailed information about these -# directives see +# directives see # # 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 diff --git a/docs/conf/extra/httpd-vhosts.conf.in b/docs/conf/extra/httpd-vhosts.conf.in index 5b3d946ae1..fbd2df4aa6 100644 --- a/docs/conf/extra/httpd-vhosts.conf.in +++ b/docs/conf/extra/httpd-vhosts.conf.in @@ -8,7 +8,7 @@ # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index 96e795f625..731578ddf6 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -1,9 +1,9 @@ # # This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information. +# See for detailed information. # In particular, see -# +# # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding @@ -140,7 +140,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/trunk/mod/core.html#options + # http://httpd.apache.org/docs/2.4/mod/core.html#options # for more information. # Options Indexes FollowSymLinks diff --git a/docs/man/tr/suexec.8 b/docs/man/tr/suexec.8 index 34a81d7135..59d370f825 100644 --- a/docs/man/tr/suexec.8 +++ b/docs/man/tr/suexec.8 @@ -36,7 +36,7 @@ suexec \- harici programları çalıştırmadan önce kullanıcıyı değiştiri \fBsuexec\fR, CGI programlarını çalıştırmadan önce Apache HTTP Sunucusu tarafından kullanıcı değiştirmek için kullanılır\&. Bunu yapabilmek için sunucunun root tarafından çalıştırılmış olması gerekir\&. HTTP artalan süreci normalde root aidiyetinde çalışmadığından \fBsuexec\fR'in çalıştırılabilir dosyasının sahibi root olmalı, setuid biti etkin (u+s) olmalı ve dosyaya root dışında hiç kimse yazamamalıdır\&. .PP -\fBsuexec\fR güvenlik modeli ve kavramlar hakkında bilgi edinmek için suexec belgesine (http://httpd\&.apache\&.org/docs/trunk/suexec\&.html) bakınız\&. +\fBsuexec\fR güvenlik modeli ve kavramlar hakkında bilgi edinmek için suexec belgesine (http://httpd\&.apache\&.org/docs/2.4/suexec\&.html) bakınız\&. .SH "SEÇENEKLER" -- 2.40.0