From cvs-return-45397-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Thu Nov 8 03:06:10 2012 Return-Path: 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 CF52AD166 for ; Thu, 8 Nov 2012 03:06:10 +0000 (UTC) Received: (qmail 91724 invoked by uid 500); 8 Nov 2012 03:06:06 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 91492 invoked by uid 500); 8 Nov 2012 03:06:05 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 91430 invoked by uid 99); 8 Nov 2012 03:06:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 03:06:02 +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; Thu, 08 Nov 2012 03:05:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E8FD723888E4; Thu, 8 Nov 2012 03:05:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406904 - /httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in Date: Thu, 08 Nov 2012 03:05:38 -0000 To: cvs@httpd.apache.org From: rbowen@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121108030538.E8FD723888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rbowen Date: Thu Nov 8 03:05:38 2012 New Revision: 1406904 URL: http://svn.apache.org/viewvc?rev=1406904&view=rev Log: s/Options/AllowOverride/ in comment describing AllowOverride Modified: httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in Modified: httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in?rev=1406904&r1=1406903&r2=1406904&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in (original) +++ httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in Thu Nov 8 03:05:38 2012 @@ -148,7 +148,7 @@ DocumentRoot "@exp_htdocsdir@" # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: - # Options FileInfo AuthConfig Limit + # AllowOverride FileInfo AuthConfig Limit # AllowOverride None