Commit 188fae97 authored by Sameer Parekh's avatar Sameer Parekh
Browse files

Set default pathnames -everywhere- to /usr/local/apache 

PR:
Obtained from:
Submitted by:	Sameer Parekh
Reviewed by: Jim, Martin


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

docs/manual/install.html

+1 −1
Changes for docs/manual/install.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ files in directories accessed by the server. 


To start the server, simply run <CODE>httpd</CODE>. This will look for

<CODE>httpd.conf</CODE> in the location compiled into the code (by

default <CODE>/usr/local/etc/httpd/conf/httpd.conf</CODE>). If

default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If

this file is somewhere else, you can give the real

location with the -f argument. For example:

docs/manual/install.html.en

+1 −1
Changes for docs/manual/install.html.en: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ files in directories accessed by the server. 


To start the server, simply run <CODE>httpd</CODE>. This will look for

<CODE>httpd.conf</CODE> in the location compiled into the code (by

default <CODE>/usr/local/etc/httpd/conf/httpd.conf</CODE>). If

default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If

this file is somewhere else, you can give the real

location with the -f argument. For example:

docs/manual/invoking.html

+1 −1
Changes for docs/manual/invoking.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ The following options are recognized on the httpd command line: 
<dd>Set the initial value for the

<A HREF="mod/core.html#serverroot">ServerRoot</A> variable to

<em>serverroot</em>. This can be overridden by the ServerRoot command in the

configuration file. The default is <code>/usr/local/etc/httpd</code>.

configuration file. The default is <code>/usr/local/apache</code>.



<dt><code>-f</code> <em>config</em>

<dd>Execute the commands in the file <em>config</em> on startup. If

docs/manual/invoking.html.en

+1 −1
Changes for docs/manual/invoking.html.en: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ The following options are recognized on the httpd command line: 
<dd>Set the initial value for the

<A HREF="mod/core.html#serverroot">ServerRoot</A> variable to

<em>serverroot</em>. This can be overridden by the ServerRoot command in the

configuration file. The default is <code>/usr/local/etc/httpd</code>.

configuration file. The default is <code>/usr/local/apache</code>.



<dt><code>-f</code> <em>config</em>

<dd>Execute the commands in the file <em>config</em> on startup. If

docs/manual/misc/FAQ.html

+3 −3
Changes for docs/manual/misc/FAQ.html: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  <!--#include virtual="header.html" -->

  <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>

  <P>

  $Revision: 1.90 $ ($Date: 1997/10/21 01:10:27 $)

  $Revision: 1.91 $ ($Date: 1997/10/25 22:35:10 $)

  </P>

  <P>

  The latest version of this FAQ is always available from the main
@@ -457,7 +457,7 @@ 
    the server error log.  Sometimes this is enough for you to diagnose

    &amp; fix the problem yourself (such as file permissions or the like).

    The default location of the error log is

    <SAMP>/usr/local/etc/httpd/logs/error_log</SAMP>, but see the

    <SAMP>/usr/local/apache/logs/error_log</SAMP>, but see the

    <A

     HREF="../mod/core.html#errorlog"

    ><SAMP>ErrorLog</SAMP></A>
@@ -1731,7 +1731,7 @@ 
    <BR>

    AuthType Basic

    <BR>

    AuthUserFile /usr/local/etc/httpd/conf/htpasswd.users

    AuthUserFile /usr/local/apache/conf/htpasswd.users

    <BR>

    AuthName special directory

    <BR>