Return-Path: 
 <cvs-return-44134-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 245749CEB
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sun, 22 Jul 2012 14:37:26 +0000 (UTC)
Received: (qmail 22146 invoked by uid 500); 22 Jul 2012 14:37:26 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 21933 invoked by uid 500); 22 Jul 2012 14:37:26 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 21910 invoked by uid 99); 22 Jul 2012 14:37:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 14:37:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 14:37:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7B2E72388962;
	Sun, 22 Jul 2012 14:37:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1364309 - /httpd/httpd/trunk/docs/manual/mod/core.xml
Date: Sun, 22 Jul 2012 14:37:03 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120722143703.7B2E72388962@eris.apache.org>

Author: covener
Date: Sun Jul 22 14:37:03 2012
New Revision: 1364309

URL: http://svn.apache.org/viewvc?rev=1364309&view=rev
Log:
copy the context restrictions from sections.html for symlink
related options

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.xml

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1364309&r1=1364308&r2=1364309&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Sun Jul 22 14:37:03 2012
@@ -3298,9 +3298,13 @@ directory</description>
       <p>Even though the server follows the symlink it does <em>not</em>
       change the pathname used to match against <directive type="section"
       module="core">Directory</directive> sections.</p>
-      <p>Note also, that this option <strong>gets ignored</strong> if set
-      inside a <directive type="section" module="core">Location</directive>
-      section.</p>
+
+      <p>The <code>FollowSymLinks</code> and
+      <code>SymLinksIfOwnerMatch</code> <directive
+      module="core">Options</directive> work only in <directive
+      type="section" module="core">Directory</directive> sections or
+      <code>.htaccess</code> files.</p>
+
       <p>Omitting this option should not be considered a security restriction,
       since symlink testing is subject to race conditions that make it
       circumventable.</p>
@@ -3349,13 +3353,17 @@ directory</description>
       target file or directory is owned by the same user id as the
       link.
 
-      <note><title>Note</title> <p>This option gets ignored if
-      set inside a <directive module="core"
-      type="section">Location</directive> section.</p>
+      <note><title>Note</title>
+      <p>The <code>FollowSymLinks</code> and
+      <code>SymLinksIfOwnerMatch</code> <directive
+      module="core">Options</directive> work only in <directive
+      type="section" module="core">Directory</directive> sections or
+      <code>.htaccess</code> files.</p>
+
       <p>This option should not be considered a security restriction,
       since symlink testing is subject to race conditions that make it
-      circumventable.</p></note>
-      </dd>
+      circumventable.</p>
+      </note> </dd>
     </dl>
 
     <p>Normally, if multiple <directive>Options</directive> could