From: Erik Abele Date: Tue, 11 Nov 2003 20:08:37 +0000 (+0000) Subject: Update transformations. X-Git-Tag: 2.0.49~386 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b47a7414c1365a67aae5a7f3bfd73d160bb50fe;p=thirdparty%2Fapache%2Fhttpd.git Update transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101757 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/invoking.html.de b/docs/manual/invoking.html.de index 28e67703ba2..4afc9dec0ce 100644 --- a/docs/manual/invoking.html.de +++ b/docs/manual/invoking.html.de @@ -76,7 +76,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.html.en b/docs/manual/invoking.html.en index fc209819cde..bbba3a44de4 100644 --- a/docs/manual/invoking.html.en +++ b/docs/manual/invoking.html.en @@ -77,7 +77,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.html.ja.jis b/docs/manual/invoking.html.ja.jis index 45863c52990..d616f2b54f4 100644 --- a/docs/manual/invoking.html.ja.jis +++ b/docs/manual/invoking.html.ja.jis @@ -80,7 +80,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/invoking.html.ru.koi8-r b/docs/manual/invoking.html.ru.koi8-r index 368e6aaaa43..89cd65392c0 100644 --- a/docs/manual/invoking.html.ru.koi8-r +++ b/docs/manual/invoking.html.ru.koi8-r @@ -74,7 +74,7 @@ × ÓÌÅÄÕÀÝÅÍ ÐÒÉÍÅÒÅ

/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.html.en b/docs/manual/mod/mod_ssl.html.en index dca55edab20..e2861eb6160 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -171,7 +171,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

@@ -197,7 +197,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/

@@ -219,7 +219,7 @@ for Client Authentication. Such a file is simply the concatenation of 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

@@ -245,7 +245,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/

@@ -282,7 +282,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

@@ -303,7 +303,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

@@ -330,7 +330,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

@@ -831,7 +831,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

@@ -857,7 +857,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/

@@ -879,7 +879,7 @@ for Remote Server Authentication. Such a file is simply the concatenation of 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

@@ -905,7 +905,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/

@@ -972,7 +972,7 @@ or additionally to SSLProxyMachineCertificatePath.

Example:

-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/ +SSLProxyMachineCertificateFile /usr/local/apache2/conf/ssl.crt/

@@ -1000,7 +1000,7 @@ comes with mod_ssl to accomplish this task.

Example:

-SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/ +SSLProxyMachineCertificatePath /usr/local/apache2/conf/ssl.crt/