From 603383a7945b762ac0315c574d19d480cd8244bf Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sun, 26 Feb 2012 10:39:06 +0000 Subject: [PATCH] Example in configuration comment should use a path consistent with the default configuration. PR 52715. Backport from trunk of r1241069 and 1241071. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1293800 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ docs/conf/httpd.conf.in | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 90d2c21257..0f35547792 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes with Apache 2.4.2 + *) Configuration: Example in comment should use a path consistent + with the default configuration. PR 52715. + [Rich Bowen, Jens Schleusener, Rainer Jung] + *) Configuration: Switch documentation links from trunk to 2.4. [Rainer Jung] diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index 731578ddf6..83dd6b89a7 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -13,10 +13,10 @@ # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so 'log/access_log' -# with ServerRoot set to '/www' will be interpreted by the -# server as '/www/log/access_log', where as '/log/access_log' will be -# interpreted as '/log/access_log'. +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. # # ServerRoot: The top of the directory tree under which the server's -- 2.40.0