From: Erik Abele Date: Tue, 11 Nov 2003 19:50:44 +0000 (+0000) Subject: apache -> apache2 X-Git-Tag: pre_ajp_proxy~1054 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=932ff30543bb903dec9045aeeb3c93510259cb45;p=apache 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 dd6d45e5c7..0a5e6fcf63 100644 --- a/docs/manual/invoking.xml +++ b/docs/manual/invoking.xml @@ -59,7 +59,7 @@ time using the -f command-line option as in

/usr/local/apache2/bin/apachectl -f - /usr/local/apache/conf/httpd.conf + /usr/local/apache2/conf/httpd.conf

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 3e86b4f9a3..47c6230c57 100644 --- a/docs/manual/invoking.xml.de +++ b/docs/manual/invoking.xml.de @@ -62,7 +62,7 @@ Kommandozeilenoption -f wie folgt verwendet wird:

/usr/local/apache2/bin/apachectl -f - /usr/local/apache/conf/httpd.conf + /usr/local/apache2/conf/httpd.conf

Wenn wä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 ff338a7b47..a713befc61 100644 --- a/docs/manual/invoking.xml.ja +++ b/docs/manual/invoking.xml.ja @@ -62,7 +62,7 @@ $B0LCV$r;XDj$9$k$3$H$b$G$-$^$9!#Nc$($P /usr/local/apache2/bin/apachectl -f - /usr/local/apache/conf/httpd.conf + /usr/local/apache2/conf/httpd.conf

$B%9%?!<%H%"%C%W$,K|;v>e-f ¸í·ÉÇà ¿É¼ÇÀ¸·Î ÁöÁ¤ÇÒ ¼öµµ ÀÖ´Ù.

/usr/local/apache2/bin/apachectl -f - /usr/local/apache/conf/httpd.conf + /usr/local/apache2/conf/httpd.conf

½ÃÀÛÇÏ´Â °úÁ¤¿¡¼­ ¹®Á¦°¡ ¾ø´Ù¸é, ¼­¹ö´Â Å͹̳ο¡¼­ ¶³¾îÁö°í ¸í·É ÇÁ·ÒÇÁÆ®°¡ °ÅÀÇ Áï½Ã ³ª¿À°ÔµÈ´Ù. ÀÌ´Â ¼­¹ö°¡ diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 5899388427..817d062f7b 100644 --- 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.

Example -SSLCertificateFile /usr/local/apache/conf/ssl.crt/server.crt +SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt @@ -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.

Example -SSLCertificateKeyFile /usr/local/apache/conf/ssl.key/server.key +SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/server.key @@ -728,7 +728,7 @@ using a coupled RSA+DSA certificate pair, this will work only if actually both certificates use the same certificate chain. Else the browsers will be confused in this situation.

Example -SSLCertificateChainFile /usr/local/apache/conf/ssl.crt/ca.crt +SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/ca.crt @@ -754,7 +754,7 @@ there: you also have to create symbolic links named contains the appropriate symbolic links. Use the Makefile which comes with mod_ssl to accomplish this task.

Example -SSLCACertificatePath /usr/local/apache/conf/ssl.crt/ +SSLCACertificatePath /usr/local/apache2/conf/ssl.crt/ @@ -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 SSLCACertificatePath.

Example -SSLCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-client.crt +SSLCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-client.crt @@ -802,7 +802,7 @@ Additionally you have to create symbolic links named contains the appropriate symbolic links. Use the Makefile which comes with mod_ssl to accomplish this task.

Example -SSLCARevocationPath /usr/local/apache/conf/ssl.crl/ +SSLCARevocationPath /usr/local/apache2/conf/ssl.crl/ @@ -825,7 +825,7 @@ the various PEM-encoded CRL files, in order of preference. This can be used alternatively and/or additionally to SSLCARevocationPath.

Example -SSLCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-client.crl +SSLCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-client.crl @@ -1190,7 +1190,7 @@ comes with mod_ssl to accomplish this task.

Example:

-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/ +SSLProxyMachineCertificatePath /usr/local/apache2/conf/ssl.crt/ @@ -1217,7 +1217,7 @@ or additionally to SSLProxyMachineCertificatePath.

Example:

-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/ +SSLProxyMachineCertificatePath /usr/local/apache2/conf/ssl.crt/ @@ -1385,7 +1385,7 @@ there: you also have to create symbolic links named contains the appropriate symbolic links. Use the Makefile which comes with mod_ssl to accomplish this task.

Example -SSLProxyCACertificatePath /usr/local/apache/conf/ssl.crt/ +SSLProxyCACertificatePath /usr/local/apache2/conf/ssl.crt/ @@ -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 SSLProxyCACertificatePath.

Example -SSLProxyCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-remote-server.crt +SSLProxyCACertificateFile /usr/local/apache2/conf/ssl.crt/ca-bundle-remote-server.crt @@ -1433,7 +1433,7 @@ Additionally you have to create symbolic links named contains the appropriate symbolic links. Use the Makefile which comes with mod_ssl to accomplish this task.

Example -SSLProxyCARevocationPath /usr/local/apache/conf/ssl.crl/ +SSLProxyCARevocationPath /usr/local/apache2/conf/ssl.crl/ @@ -1456,7 +1456,7 @@ the various PEM-encoded CRL files, in order of preference. This can be used alternatively and/or additionally to SSLProxyCARevocationPath.

Example -SSLProxyCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-remote-server.crl +SSLProxyCARevocationFile /usr/local/apache2/conf/ssl.crl/ca-bundle-remote-server.crl