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

diff --git a/docs/manual/install.html b/docs/manual/install.html
index 38e14980b7a3a4fc4ffe381b2e760fd3f979f3c8..99d4fe39534936fc416009501b9a6e33c29a3488 100644 (file)
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -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:
 

diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 38e14980b7a3a4fc4ffe381b2e760fd3f979f3c8..99d4fe39534936fc416009501b9a6e33c29a3488 100644 (file)
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -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:
 

diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index 48e08f782a55320c0c43be85957b9b3b76f6f062..669b359f66d8b3357bb9c306cc720577889223f7 100644 (file)
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -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

diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index 48e08f782a55320c0c43be85957b9b3b76f6f062..669b359f66d8b3357bb9c306cc720577889223f7 100644 (file)
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -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

diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index eae5eaa38f41b5e76f3d7a9df38230e9fd382f39..5699ca0257c2045845621606a96a08fb59f7944a 100644 (file)
--- a/docs/manual/misc/FAQ.html
+++ b/docs/manual/misc/FAQ.html
@@ -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>

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 05068fab5398005e38abd2a4a21f1329ccb08947..0f1ff5f2086b9f07b16c6fd5738c2f823f3f0361 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -488,7 +488,7 @@ different sections are combined when a request is received
 <!--%plaintext &lt;?INDEX {\tt DocumentRoot} directive&gt; -->
 <strong>Syntax:</strong> DocumentRoot <em>directory-filename</em><br>
 <strong>Default:</strong> <code>DocumentRoot
-/usr/local/etc/httpd/htdocs</code><br>
+/usr/local/apache/htdocs</code><br>
 <strong>Context:</strong> server config, virtual host<br>
 <strong>Status:</strong> core<p>
 
@@ -1530,7 +1530,7 @@ use with <a href="../host.html">Host-header based virtual hosts</a>.
 <h2><A name="serverroot">ServerRoot directive</A></h2>
 <!--%plaintext &lt;?INDEX {\tt ServerRoot} directive&gt; -->
 <strong>Syntax:</strong> ServerRoot <em>directory-filename</em><br>
-<strong>Default:</strong> <code>ServerRoot /usr/local/etc/httpd</code><br>
+<strong>Default:</strong> <code>ServerRoot /usr/local/apache</code><br>
 <strong>Context:</strong> server config<br>
 <strong>Status:</strong> core<p>
 

diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html
index 484c2b8352f3cae2db9e138a0b1fd5aa92322da0..7954c8e49287d35f06323cea576de3b172988cc4 100644 (file)
--- a/docs/manual/mod/mod_alias.html
+++ b/docs/manual/mod/mod_alias.html
@@ -59,7 +59,7 @@ return the file /ftp/pub/image/foo.gif.
 <P>
 Note that if you include a trailing / on the <em>url-path</em> then the
 server will require a trailing / in order to expand the alias.  That is,
-if you use <code>Alias /icons/ /usr/local/etc/httpd/icons/</code> then
+if you use <code>Alias /icons/ /usr/local/apache/icons/</code> then
 the url <code>/icons</code> will not be aliased.
 </p>
 <P>
@@ -83,7 +83,7 @@ and if it matches, the server will substitute any parenthesized
 matches into the given string and use it as a filename. For example,
 to activate the <code>/icons</code> directory, one might use:
 <pre>
-    AliasMatch ^/icons(.*) /usr/local/etc/httpd/icons$1
+    AliasMatch ^/icons(.*) /usr/local/apache/icons$1
 </pre>
 </p>
 
@@ -248,7 +248,7 @@ and if it matches, the server will substitute any parenthesized
 matches into the given string and use it as a filename. For example,
 to activate the standard <code>/cgi-bin</code>, one might use:
 <pre>
-    ScriptAlias ^/cgi-bin(.*) /usr/local/etc/httpd/cgi-bin$1
+    ScriptAlias ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
 </pre>
 </p>
 

diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html
index 373590a31195bc0ae122194655da2520bebee7d5..673d81beb35099db3e75587db408b001537e92c4 100644 (file)
--- a/docs/manual/stopping.html
+++ b/docs/manual/stopping.html
@@ -25,13 +25,13 @@ be described in a moment.
 
 <p>To send a signal to the parent you should issue a command such as:
 <blockquote><pre>
-    kill -TERM `cat /usr/local/etc/httpd/logs/httpd.pid`
+    kill -TERM `cat /usr/local/apache/logs/httpd.pid`
 </pre></blockquote>
 
 You can read about its progress by issuing:
 
 <blockquote><pre>
-    tail -f /usr/local/etc/httpd/logs/error_log
+    tail -f /usr/local/apache/logs/error_log
 </pre></blockquote>
 
 Modify those examples to match your

diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index 373590a31195bc0ae122194655da2520bebee7d5..673d81beb35099db3e75587db408b001537e92c4 100644 (file)
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -25,13 +25,13 @@ be described in a moment.
 
 <p>To send a signal to the parent you should issue a command such as:
 <blockquote><pre>
-    kill -TERM `cat /usr/local/etc/httpd/logs/httpd.pid`
+    kill -TERM `cat /usr/local/apache/logs/httpd.pid`
 </pre></blockquote>
 
 You can read about its progress by issuing:
 
 <blockquote><pre>
-    tail -f /usr/local/etc/httpd/logs/error_log
+    tail -f /usr/local/apache/logs/error_log
 </pre></blockquote>
 
 Modify those examples to match your

diff --git a/docs/manual/suexec.html b/docs/manual/suexec.html
index 6eb3a93e19e9095663b7d0153b403096456d5912..90af9ad1176df31ebd835bb83446363863e05dda 100644 (file)
--- a/docs/manual/suexec.html
+++ b/docs/manual/suexec.html
@@ -326,14 +326,14 @@ match your local Apache installation.
       *             transactions and errors logged for auditing and
       *             debugging purposes.
       */
-     #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
+     #define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */
 
      /*
       * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
       *             will be the only hierarchy (aside from UserDirs)
       *             that can be used for suEXEC behavior.
       */
-     #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
+     #define DOC_ROOT "/usr/local/apache/htdocs"
 
      /*
       * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
@@ -360,7 +360,7 @@ location.
 <EM>From src/httpd.h</EM>
 <PRE>
      /* The path to the suEXEC wrapper */
-     #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+     #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
 </PRE>
 </P>
 
@@ -378,7 +378,7 @@ exercise above to the defined location for <STRONG>SUEXEC_BIN</STRONG>.
 </P>
 
 <P ALIGN="LEFT">
-<STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
 </P>
 
 <P ALIGN="LEFT">
@@ -389,8 +389,8 @@ user shell, do so now and execute the following commands.
 </P>
 
 <P ALIGN="LEFT">
-<STRONG><CODE>chown root /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG><BR>
-<STRONG><CODE>chmod 4711 /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>chown root /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG><BR>
+<STRONG><CODE>chmod 4711 /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
 </P>
 
 <P ALIGN="CENTER">

diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en
index 6eb3a93e19e9095663b7d0153b403096456d5912..90af9ad1176df31ebd835bb83446363863e05dda 100644 (file)
--- a/docs/manual/suexec.html.en
+++ b/docs/manual/suexec.html.en
@@ -326,14 +326,14 @@ match your local Apache installation.
       *             transactions and errors logged for auditing and
       *             debugging purposes.
       */
-     #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
+     #define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */
 
      /*
       * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
       *             will be the only hierarchy (aside from UserDirs)
       *             that can be used for suEXEC behavior.
       */
-     #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
+     #define DOC_ROOT "/usr/local/apache/htdocs"
 
      /*
       * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
@@ -360,7 +360,7 @@ location.
 <EM>From src/httpd.h</EM>
 <PRE>
      /* The path to the suEXEC wrapper */
-     #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
+     #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
 </PRE>
 </P>
 
@@ -378,7 +378,7 @@ exercise above to the defined location for <STRONG>SUEXEC_BIN</STRONG>.
 </P>
 
 <P ALIGN="LEFT">
-<STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
 </P>
 
 <P ALIGN="LEFT">
@@ -389,8 +389,8 @@ user shell, do so now and execute the following commands.
 </P>
 
 <P ALIGN="LEFT">
-<STRONG><CODE>chown root /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG><BR>
-<STRONG><CODE>chmod 4711 /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>chown root /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG><BR>
+<STRONG><CODE>chmod 4711 /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
 </P>
 
 <P ALIGN="CENTER">