Commit dfa47334 authored by Yoshiki Hayashi's avatar Yoshiki Hayashi
Browse files

Remove reference to srm.conf and access.conf which was forward ported 

by my previous commit.
Suggested by Joshua Slive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87694 13f79535-47bb-0310-9956-ffa450edef68
parent 58a8f009

docs/manual/configuring.html

+6 −8
Original line number Diff line number Diff line
@@ -44,14 +44,12 @@ 
>directives</A> in plain text configuration files.  The main

configuration file is usually called <CODE>httpd.conf</CODE>.  The

location of this file is set at compile-time, but may be overridden

with the <CODE>-f</CODE> command line flag.  Some sites also have

<CODE>srm.conf</CODE> and <CODE>access.conf</CODE> files for <A

HREF="http://www.apache.org/info/three-config-files.html">historical

reasons</A>.  In addition, other configuration files may be added using

the <CODE><A HREF="mod/core.html#include">Include</A></CODE>

directive.  Any directive may be placed in any of these configuration

files.  Changes to the main configuration files are only recognized by

Apache when it is started or restarted.</p>

with the <CODE>-f</CODE> command line flag.  In addition, other

configuration files may be added using the <CODE><A

HREF="mod/core.html#include">Include</A></CODE> directive.  Any

directive may be placed in any of these configuration files.  Changes

to the main configuration files are only recognized by Apache when it

is started or restarted.</p>



<P>New with Apache 1.3.13 is a feature where if any configuration

file is actually a directory, Apache will enter that directory

docs/manual/configuring.html.en

+6 −8
Original line number Diff line number Diff line
@@ -44,14 +44,12 @@ 
>directives</A> in plain text configuration files.  The main

configuration file is usually called <CODE>httpd.conf</CODE>.  The

location of this file is set at compile-time, but may be overridden

with the <CODE>-f</CODE> command line flag.  Some sites also have

<CODE>srm.conf</CODE> and <CODE>access.conf</CODE> files for <A

HREF="http://www.apache.org/info/three-config-files.html">historical

reasons</A>.  In addition, other configuration files may be added using

the <CODE><A HREF="mod/core.html#include">Include</A></CODE>

directive.  Any directive may be placed in any of these configuration

files.  Changes to the main configuration files are only recognized by

Apache when it is started or restarted.</p>

with the <CODE>-f</CODE> command line flag.  In addition, other

configuration files may be added using the <CODE><A

HREF="mod/core.html#include">Include</A></CODE> directive.  Any

directive may be placed in any of these configuration files.  Changes

to the main configuration files are only recognized by Apache when it

is started or restarted.</p>



<P>New with Apache 1.3.13 is a feature where if any configuration

file is actually a directory, Apache will enter that directory