apache -> apache2

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

diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml
index dd6d45e5c7f774c99b16378d000b4ce01ae06c05..0a5e6fcf6317b1fad0454824f2648cba9903a8bd 100644 (file)
--- a/docs/manual/invoking.xml
+++ b/docs/manual/invoking.xml
@@ -59,7 +59,7 @@
     time using the <code>-f</code> command-line option as in</p>
 
 <example>/usr/local/apache2/bin/apachectl -f
-      /usr/local/apache/conf/httpd.conf</example>
+      /usr/local/apache2/conf/httpd.conf</example>
 
     <p>If all goes well during startup, the server will detach from
     the terminal and the command prompt will return almost

diff --git a/docs/manual/invoking.xml.de b/docs/manual/invoking.xml.de
index 3e86b4f9a3d1b0567a606f05c42c09f8323a3033..47c6230c578085ae85fab0243d01c76b588b4ea8 100644 (file)
--- a/docs/manual/invoking.xml.de
+++ b/docs/manual/invoking.xml.de
@@ -62,7 +62,7 @@
     Kommandozeilenoption <code>-f</code> wie folgt verwendet wird:</p>
 
     <example>/usr/local/apache2/bin/apachectl -f
-      /usr/local/apache/conf/httpd.conf</example>
+      /usr/local/apache2/conf/httpd.conf</example>
 
     <p>Wenn w&#228;hrend des Starts alles gutgeht, trennt sich der Server
     vom Terminal ab und die Eingabeaufforderung erscheint gleich darauf

diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index ff338a7b47b0f3dadc17b406558e7395a8e84262..a713befc615bce5982b54f6bd810edfa51cd7d4f 100644 (file)
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.xml.ja
@@ -62,7 +62,7 @@
     \e$B0LCV$r;XDj$9$k$3$H$b$G$-$^$9!#Nc$($P<!$N$h$&$K$G$9!#\e(B</p>
 
 <example>/usr/local/apache2/bin/apachectl -f
-      /usr/local/apache/conf/httpd.conf</example>
+      /usr/local/apache2/conf/httpd.conf</example>
 
     <p>\e$B%9%?!<%H%"%C%W$,K|;v>e<j$/$$$C$?$i!"%5!<%P$O%?!<%_%J%k$+$i\e(B
     \e$B@Z$jN%$5$l$F!"%3%^%s%I%W%m%s%W%H$,B(:B$KLa$C$F$/$k$G$7$g$&!#\e(B

diff --git a/docs/manual/invoking.xml.ko b/docs/manual/invoking.xml.ko
index e55a1153167ca2c75523a8ea8d6dd1d4aeb414ef..5216f4c6766ac135a65fc368a3d1c334a443cab5 100644 (file)
--- a/docs/manual/invoking.xml.ko
+++ b/docs/manual/invoking.xml.ko
@@ -54,7 +54,7 @@
     ´ÙÀ½°ú °°ÀÌ <code>-f</code> ¸í·ÉÇà ¿É¼ÇÀ¸·Î ÁöÁ¤ÇÒ ¼öµµ ÀÖ´Ù.</p>
 
 <example>/usr/local/apache2/bin/apachectl -f
-      /usr/local/apache/conf/httpd.conf</example>
+      /usr/local/apache2/conf/httpd.conf</example>
 
     <p>½ÃÀÛÇÏ´Â °úÁ¤¿¡¼­ ¹®Á¦°¡ ¾ø´Ù¸é, ¼­¹ö´Â Å͹̳ο¡¼­
     ¶³¾îÁö°í ¸í·É ÇÁ·ÒÇÁÆ®°¡ °ÅÀÇ Áï½Ã ³ª¿À°ÔµÈ´Ù. ÀÌ´Â ¼­¹ö°¡

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 5899388427008db3a9d37bdafdfc0dbfadaea073..817d062f7bd537b0cb4791eee082ea806ce82165 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -662,7 +662,7 @@ Pass Phrase dialog is forced at startup time. This directive can be used up to
 two times (referencing different filenames) when both a RSA and a DSA based
 server certificate is used in parallel.</p>
 <example><title>Example</title>
-SSLCertificateFile /usr/local/apache/conf/ssl.crt/server.crt
+SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt
 </example>
 </usage>
 </directivesynopsis>
@@ -689,7 +689,7 @@ at startup time. This directive can be used up to two times
 (referencing different filenames) when both a RSA and a DSA based
 private key is used in parallel.</p>
 <example><title>Example</title>
-SSLCertificateKeyFile /usr/local/apache/conf/ssl.key/server.key
+SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/server.key
 </example>
 </usage>
 </directivesynopsis>
@@ -728,7 +728,7 @@ using a coupled RSA+DSA certificate pair, this will work only if actually both
 certificates use the <em>same</em> certificate chain. Else the browsers will be
 confused in this situation.</p>
 <example><title>Example</title>
-SSLCertificateChainFile /usr/local/apache/conf/ssl.crt/ca.crt
+SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/ca.crt
 </example>
 </usage>
 </directivesynopsis>
@@ -754,7 +754,7 @@ there: you also have to create symbolic links named
 contains the appropriate symbolic links. Use the <code>Makefile</code> which
 comes with mod_ssl to accomplish this task.</p>
 <example><title>Example</title>
-SSLCACertificatePath /usr/local/apache/conf/ssl.crt/
+SSLCACertificatePath /usr/local/apache2/conf/ssl.crt/
 </example>
 </usage>
 </directivesynopsis>
@@ -776,7 +776,7 @@ concatenation of the various PEM-encoded Certificate files, in order of
 preference. This can be used alternatively and/or additionally to 
 <directive module="mod_ssl">SSLCACertificatePath</directive>.</p>
 <example><title>Example</title>
-SSLCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-client.crt
+SSLCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-client.crt
 </example>
 </usage>
 </directivesynopsis>
@@ -802,7 +802,7 @@ Additionally you have to create symbolic links named
 contains the appropriate symbolic links. Use the <code>Makefile</code> which
 comes with <module>mod_ssl</module> to accomplish this task.</p>
 <example><title>Example</title>
-SSLCARevocationPath /usr/local/apache/conf/ssl.crl/
+SSLCARevocationPath /usr/local/apache2/conf/ssl.crl/
 </example>
 </usage>
 </directivesynopsis>
@@ -825,7 +825,7 @@ the various PEM-encoded CRL files, in order of preference. This can be
 used alternatively and/or additionally to <directive
 module="mod_ssl">SSLCARevocationPath</directive>.</p>
 <example><title>Example</title>
-SSLCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-client.crl
+SSLCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-client.crl
 </example>
 </usage>
 </directivesynopsis>
@@ -1190,7 +1190,7 @@ comes with mod_ssl to accomplish this task.
 <p>
 Example:</p>
 <example>
-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/
+SSLProxyMachineCertificatePath /usr/local/apache2/conf/ssl.crt/
 </example> 
 </usage> 
 </directivesynopsis>
@@ -1217,7 +1217,7 @@ or additionally to <code>SSLProxyMachineCertificatePath</code>.
 <p>
 Example:</p>
 <example>
-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/
+SSLProxyMachineCertificatePath /usr/local/apache2/conf/ssl.crt/
 </example> 
 </usage> 
 </directivesynopsis>
@@ -1385,7 +1385,7 @@ there: you also have to create symbolic links named
 contains the appropriate symbolic links. Use the <code>Makefile</code> which
 comes with mod_ssl to accomplish this task.</p>
 <example><title>Example</title>
-SSLProxyCACertificatePath /usr/local/apache/conf/ssl.crt/
+SSLProxyCACertificatePath /usr/local/apache2/conf/ssl.crt/
 </example>
 </usage>
 </directivesynopsis>
@@ -1407,7 +1407,7 @@ concatenation of the various PEM-encoded Certificate files, in order of
 preference. This can be used alternatively and/or additionally to 
 <directive module="mod_ssl">SSLProxyCACertificatePath</directive>.</p>
 <example><title>Example</title>
-SSLProxyCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-remote-server.crt
+SSLProxyCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-remote-server.crt
 </example>
 </usage>
 </directivesynopsis>
@@ -1433,7 +1433,7 @@ Additionally you have to create symbolic links named
 contains the appropriate symbolic links. Use the <code>Makefile</code> which
 comes with <module>mod_ssl</module> to accomplish this task.</p>
 <example><title>Example</title>
-SSLProxyCARevocationPath /usr/local/apache/conf/ssl.crl/
+SSLProxyCARevocationPath /usr/local/apache2/conf/ssl.crl/
 </example>
 </usage>
 </directivesynopsis>
@@ -1456,7 +1456,7 @@ the various PEM-encoded CRL files, in order of preference. This can be
 used alternatively and/or additionally to <directive
 module="mod_ssl">SSLProxyCARevocationPath</directive>.</p>
 <example><title>Example</title>
-SSLProxyCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-remote-server.crl
+SSLProxyCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-remote-server.crl
 </example>
 </usage>
 </directivesynopsis>