From: Erik Abele <erikabele@apache.org>
Date: Wed, 13 Feb 2008 14:43:01 +0000 (+0000)
Subject: Transformation.
X-Git-Tag: 2.0.64~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=470bb49405c866aefba2b85188b3122975851eab;p=thirdparty%2Fapache%2Fhttpd.git

Transformation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@627433 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_include.xml.ja b/docs/manual/mod/mod_include.xml.ja
index 12daeb64c27..0422723c1ee 100644
--- a/docs/manual/mod/mod_include.xml.ja
+++ b/docs/manual/mod/mod_include.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 104991:421174 (outdated) -->
+<!-- English Revision: 104991:619738 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 08d01bbf201..b4d25dc3968 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -174,8 +174,9 @@ respect to case</td></tr>
       <li><code>Request_URI</code> - the resource requested on the HTTP
        request line -- generally the portion of the URL
       following the scheme and host portion without the query string. See
-      <code class="module"><a href="../mod/mod_rewrite.html#rewritecond">mod_rewrite</a></code>
-      for extra information on how to match your query string.</li>
+      the <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
+      directive of <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> for extra information on
+      how to match your query string.</li>
     </ul>
 </li>
 
diff --git a/docs/manual/mod/mod_setenvif.xml.ja b/docs/manual/mod/mod_setenvif.xml.ja
index 37a84fbc0a3..96effa2d407 100644
--- a/docs/manual/mod/mod_setenvif.xml.ja
+++ b/docs/manual/mod/mod_setenvif.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421174 -->
+<!-- English Revision: 421174:619728 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_setenvif.xml.ko b/docs/manual/mod/mod_setenvif.xml.ko
index 3a1fea73791..7a7351b54ed 100644
--- a/docs/manual/mod/mod_setenvif.xml.ko
+++ b/docs/manual/mod/mod_setenvif.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 421174 -->
+<!-- English Revision: 421174:619728 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_setenvif.xml.meta b/docs/manual/mod/mod_setenvif.xml.meta
index 60e6547df3b..ed14967a567 100644
--- a/docs/manual/mod/mod_setenvif.xml.meta
+++ b/docs/manual/mod/mod_setenvif.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index 5effbaef701..bc8b48d3fe6 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -49,7 +49,6 @@ author.</p>
 <h2><a name="about" id="about">About The Module</a></h2>
 <ul>
 <li><a href="#history">What is the history of mod_ssl?</a></li>
-<li><a href="#y2k">mod_ssl and Year 2000?</a></li>
 <li><a href="#wassenaar">mod_ssl and Wassenaar Arrangement?</a></li>
 </ul>
 
@@ -104,7 +103,7 @@ author.</p>
 <li><a href="#mutex">Why do I get permission errors related to 
 SSLMutex when I start Apache?</a></li>
 <li><a href="#entropy">Why does mod_ssl stop with the error "Failed to 
-generate temporary 512 bit RSA private key", when I start Apache?</a></li>
+generate temporary 512 bit RSA private key" when I start Apache?</a></li>
 </ul>
 
 <h3><a name="mutex" id="mutex">Why do I get permission errors related to 
@@ -120,7 +119,7 @@ generate temporary 512 bit RSA private key", when I start Apache?</a></li>
 
 
 <h3><a name="entropy" id="entropy">Why does mod_ssl stop with the error
-	"Failed to generate temporary 512 bit RSA private key", when I start 
+	"Failed to generate temporary 512 bit RSA private key" when I start 
 	Apache?</a></h3>
     <p>Cryptographic software needs a source of unpredictable data
     to work correctly. Many open source operating systems provide
@@ -134,7 +133,7 @@ generate temporary 512 bit RSA private key", when I start Apache?</a></li>
     <p>To prevent this error, <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> has to provide 
     enough entropy to the PRNG to allow it to work correctly. This can 
     be done via the <code class="directive"><a href="../mod/mod_ssl.html#sslrandomseed">SSLRandomSeed</a></code> 
-    directives.</p>
+    directive.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -146,7 +145,7 @@ the same server?</a></li>
 <li><a href="#httpstest">How do I speak HTTPS manually for testing 
 purposes?</a></li>
 <li><a href="#hang">Why does the connection hang when I connect to my 
-SSL-aware Apache server</a></li>
+SSL-aware Apache server?</a></li>
 <li><a href="#refused">Why do I get ``Connection Refused'' errors, when 
 trying to access my newly installed Apache+mod_ssl server via HTTPS?</a></li>
 <li><a href="#envvars">Why are the <code>SSL_XXX</code> variables not
@@ -161,16 +160,17 @@ relative hyperlinks?</a></li>
     port 80, HTTPS to port 443), so there is no direct conflict between 
     them. You can either run two separate server instances bound to 
     these ports, or use Apache's elegant virtual hosting facility to 
-    create two virtual servers over one instance of Apache - one 
-    responding to requests on port 80 and speaking HTTP and the other 
-    responding to requests on port 443 speaking HTTPS.</p>
+    create two virtual servers, both served by the same instance of Apache 
+    - one responding over HTTP to requests on port 80, and the other 
+    responding over HTTPS to requests on port 443.</p>
 
 
 <h3><a name="ports" id="ports">Which port does HTTPS use?</a></h3>
 <p>You can run HTTPS on any port, but the standards specify port 443, which
     is where any HTTPS compliant browser will look by default. You can force
-    your browser to look on a different port by specifying it in the URL like
-    this (for port 666): <code>https://secure.server.dom:666/</code></p>
+    your browser to look on a different port by specifying it in the URL. For
+    example, if your server is set up to serve pages over HTTPS on port 8080,
+    you can access them at <code>https://example.com:8080/</code></p>
 
 
 <h3><a name="httpstest" id="httpstest">How do I speak HTTPS manually for testing purposes?</a></h3>
@@ -182,41 +182,39 @@ relative hyperlinks?</a></li>
     <p>for simple testing of Apache via HTTP, it's not so easy for
     HTTPS because of the SSL protocol between TCP and HTTP. With the
     help of OpenSSL's <code>s_client</code> command, however, you can 
-    do a similar check for HTTPS:</p>
+    do a similar check via HTTPS:</p>
     
     <div class="example"><p><code>$ openssl s_client -connect localhost:443 -state -debug<br />
     GET / HTTP/1.0</code></p></div>
-    
-    <p>Before the actual HTTP response you will receive detailed 
-    information about the SSL handshake. For a more general command 
-    line client which directly understands both HTTP and HTTPS, can 
-    perform GET and POST operations, can use a proxy, supports byte 
-    ranges, etc. you should have a look at the nifty 
-    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can 
-    check that Apache is responding correctly on ports 80 and 443 as 
-    follows:</p>
-    
+
+    <p>Before the actual HTTP response you will receive detailed
+    information about the SSL handshake. For a more general command
+    line client which directly understands both HTTP and HTTPS, can
+    perform GET and POST operations, can use a proxy, supports byte
+    ranges, etc. you should have a look at the nifty
+    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can
+    check that Apache is responding correctly to requests via HTTP and
+    HTTPS as follows:</p>
+
     <div class="example"><p><code>$ curl http://localhost/<br />
     $ curl https://localhost/</code></p></div>
 
 
 <h3><a name="hang" id="hang">Why does the connection hang when I connect 
     to my SSL-aware Apache server?</a></h3>
-<p>Because you connected with HTTP to the HTTPS port, i.e. you used an URL of
-    the form ``<code>http://</code>'' instead of ``<code>https://</code>''.
-    This also happens the other way round when you connect via HTTPS to a HTTP
-    port, i.e. when you try to use ``<code>https://</code>'' on a server that
-    doesn't support SSL (on this port). Make sure you are connecting to a
-    virtual server that supports SSL, which is probably the IP associated with
-    your hostname, not localhost (127.0.0.1).</p>
 
+<p>This can happen when you try to connect to a HTTPS server (or virtual
+    server) via HTTP (eg, using <code>http://example.com/</code> instead of
+    <code>https://example.com</code>). It can also happen when trying to
+    connect via HTTPS to a HTTP server (eg, using
+    <code>https://example.com/</code> on a server which doesn't support HTTPS,
+    or which supports it on a non-standard port). Make sure that you're
+    connecting to a (virtual) server that supports SSL.</p>
 
 <h3><a name="refused" id="refused">Why do I get ``Connection Refused'' messages, 
     when trying to access my newly installed Apache+mod_ssl server via HTTPS?</a></h3>
-<p>This can happen for various reasons. The most common mistakes 
-    include starting Apache with just <code>apachectl start</code> (or
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code>) instead of <code>apachectl startssl</code> (or
-    <code>httpd -DSSL</code>). Your configuration may also be incorrect. 
+<p>
+    This error can be caused by an incorrect configuration.
     Please make sure that your <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directives match your 
     <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     directives. If all else fails, please start afresh, using the default 
@@ -244,7 +242,7 @@ relative hyperlinks?</a></li>
 
     <p>This rewrite ruleset lets you use hyperlinks of the form
     <code>&lt;a href="document.html:SSL"&gt;</code>, to switch to HTTPS
-    in a relative link.</p>
+    in a relative link. (Replace SSL with NOSSL to switch to HTTP.)</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -253,7 +251,7 @@ relative hyperlinks?</a></li>
 <li><a href="#keyscerts">What are RSA Private Keys, CSRs and 
 Certificates?</a></li>
 <li><a href="#startup">Is there a difference on startup between
-the original Apache and an SSL-aware Apache?</a></li>
+a non-SSL-aware Apache and an SSL-aware Apache?</a></li>
 <li><a href="#selfcert">How do I create a self-signed SSL 
 Certificate for testing purposes?</a></li>
 <li><a href="#realcert">How do I create a real SSL Certificate?</a></li>
@@ -299,7 +297,7 @@ verify my Verisign Global ID server certificate?</a></li>
 
 
 <h3><a name="startup" id="startup">Is there a difference on startup between 
-    the original Apache and an SSL-aware Apache?</a></h3>
+    a non-SSL-aware Apache and an SSL-aware Apache?</a></h3>
 <p>Yes. In general, starting Apache with 
     <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> built-in is just like starting Apache 
     without it. However, if you have a passphrase on your SSL private 
@@ -310,7 +308,8 @@ verify my Verisign Global ID server certificate?</a></li>
     can be problematic - for example, when starting the server from the 
     system boot scripts. In this case, you can follow the steps
     <a href="#removepassphrase">below</a> to remove the passphrase from
-    your private key.</p>
+    your private key. Bear in mind that doing so brings additional security
+    risks - proceed with caution!</p>
 
 
 <h3><a name="selfcert" id="selfcert">How do I create a self-signed SSL 
@@ -505,7 +504,7 @@ Certificate for testing purposes?</a></h3>
 <h3><a name="removepassphrase" id="removepassphrase">How can I get rid of the pass-phrase dialog at Apache startup time?</a></h3>
 <p>The reason this dialog pops up at startup and every re-start
     is that the RSA private key inside your server.key file is stored in
-    encrypted format for security reasons. The pass-phrase is needed decrypt
+    encrypted format for security reasons. The pass-phrase is needed to decrypt
     this file, so it can be read and parsed. Removing the pass-phrase 
     removes a layer of security from your server - proceed with caution!</p>
     <ol>
@@ -572,7 +571,7 @@ Certificate for testing purposes?</a></h3>
 bad certificate" error?</a></h3>
 <p>Errors such as <code>OpenSSL: error:14094412: SSL
     routines:SSL3_READ_BYTES:sslv3 alert bad certificate</code> in the SSL
-    logfile, are usually caused a browser which is unable to handle the server
+    logfile, are usually caused by a browser which is unable to handle the server
     certificate/private-key. For example, Netscape Navigator 3.x is 
     unable to handle RSA key lengths not equal to 1024 bits.</p>
 
@@ -615,7 +614,7 @@ Verisign, for installing my Verisign certificate?</a></h3>
     certificate to a file, and give the name of that file to the 
     <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatefile">SSLCertificateFile</a></code> directive.
     You will also need to give it the key file. For more information, 
-    see the <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></code> 
+    see the <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></code>
     directive.</p> 
 
 
@@ -658,6 +657,7 @@ error when connecting to my newly installed server?</a></li>
 virtual hosts?</a></li>
 <li><a href="#vhosts2">Why is it not possible to use Name-Based Virtual
 Hosting to identify different SSL virtual hosts?</a></li>
+<li><a href="#comp">How do I get SSL compression working?</a></li>
 <li><a href="#lockicon">When I use Basic Authentication over HTTPS
 the lock icon in Netscape browsers stays unlocked when the dialog pops up.
 Does this mean the username/password is being sent unencrypted?</a></li>
@@ -730,7 +730,7 @@ trying to use Anonymous Diffie-Hellman (ADH) ciphers?</a></h3>
 <h3><a name="sharedciphers" id="sharedciphers">Why do I get a 'no shared ciphers' 
 error when connecting to my newly installed server?</a></h3>
 <p>Either you have made a mistake with your 
-    <code class="directive"><a href="../mod/mod_ssl.html#&gt;sslciphersuite">&gt;SSLCipherSuite</a></code>
+    <code class="directive"><a href="../mod/mod_ssl.html#sslciphersuite">SSLCipherSuite</a></code>
     directive (compare it with the pre-configured example in
     <code>httpd.conf-dist</code>) or you chose to use DSA/DH
     algorithms instead of RSA when you generated your private key
@@ -982,8 +982,8 @@ provide when writing a bug report?</a></h3>
     <dt>In case of core dumps please include a Backtrace</dt>
     <dd>If your Apache+mod_ssl+OpenSSL dumps its core, please attach
     a stack-frame ``backtrace'' (see <a href="#backtrace">below</a> 
-    for information on how to get this). Without this information, the 
-    reason for your core dump cannot be found
+    for information on how to get this). This information is required
+    in order to find a reason for your core dump.
     </dd>
     
     <dt>A detailed description of your problem</dt>