doc rebuild for russian integration.

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

diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1
index f1d262aa5e0bd82ef1b5390ed4ac00c5d36a373d..1129ae4c4cf4d539f99d33737d0bada444292669 100644 (file)
--- a/docs/man/htdbm.1
+++ b/docs/man/htdbm.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTDBM" 1 "2020-06-10" "Apache HTTP Server" "htdbm"
+.TH "HTDBM" 1 "2020-10-09" "Apache HTTP Server" "htdbm"
 
 .SH NAME
 htdbm \- Manipulate DBM password databases
@@ -163,7 +163,7 @@ To convert an existing text file \fBhtpasswd\fR-generated password file to a \fB
 .nf
 
       htdbm -cbp passwords\&.dbm bogus bogus
-      awk ‘BEGIN { FS=”:” }; {system (“htdbm -bp passwords\&.dbm ” $1 ” ” $2)}’ passwords
+      awk ‘BEGIN { FS=”:” }; {system (“htdbm -bp passwords\&.dbm ” $1 ” ” $2)}’ passwords
       htdbm -x bogus
     
 .fi

diff --git a/docs/manual/getting-started.html.en.utf8 b/docs/manual/getting-started.html.en.utf8
index 1572082c78487ccd6ca7141029c344b879b0c0fa..57f0390aeb1fac3d136ae98abda11a75a8afdc63 100644 (file)
--- a/docs/manual/getting-started.html.en.utf8
+++ b/docs/manual/getting-started.html.en.utf8
@@ -24,7 +24,8 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="./">Version 2.5</a></div><div id="page-content"><div id="preamble"><h1>Getting Started</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./en/getting-started.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/getting-started.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
+<a href="./fr/getting-started.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ru/getting-started.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
 
 <p>If you're completely new to the Apache HTTP Server, or even to running
@@ -224,7 +225,8 @@ know.</p>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./en/getting-started.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/getting-started.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
+<a href="./fr/getting-started.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ru/getting-started.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="https://httpd.apache.org/lists.html">mailing lists</a>.</div>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 var comments_shortname = 'httpd';

diff --git a/docs/manual/index.html.en.utf8 b/docs/manual/index.html.en.utf8
index e2caed14b1861c54fd9f9b42fb18f36ba74d38f1..b2478b06d1c7fc0fd706d4df80cb4b734bc08530 100644 (file)
--- a/docs/manual/index.html.en.utf8
+++ b/docs/manual/index.html.en.utf8
@@ -35,6 +35,7 @@ Documentation</h1>
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./ru/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
@@ -115,6 +116,7 @@ Documentation</h1>
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./ru/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div><div id="footer">

diff --git a/docs/manual/mod/mod_proxy.html.en.utf8 b/docs/manual/mod/mod_proxy.html.en.utf8
index 9ae5812fa6fe7137bc9c83fd8f53f633a5029546..b84943e6bb5162ffeb8246626c7385499da36736 100644 (file)
--- a/docs/manual/mod/mod_proxy.html.en.utf8
+++ b/docs/manual/mod/mod_proxy.html.en.utf8
@@ -1926,10 +1926,11 @@ connections</td></tr>
 <div class="directive-section"><h2><a name="ProxyRemote" id="ProxyRemote">ProxyRemote</a> <a name="proxyremote" id="proxyremote">Directive</a> <a title="Permanent link" href="#proxyremote" class="permalink">&para;</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Remote proxy used to handle certain requests</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyRemote <var>match</var> <var>remote-server</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyRemote <var>match</var> <var>remote-server</var> [<var>username:password</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is usable only in httpd 2.5.1 and later.</td></tr>
 </table>
     <p>This defines remote proxies to this proxy. <var>match</var> is either the
     name of a URL-scheme that the remote server supports, or a partial URL
@@ -1960,6 +1961,14 @@ ProxyRemote ftp http://ftpproxy.mydomain:8080</pre>
     webserver can be embedded within a virtualhost URL space even if that
     server is hidden by another forward proxy.</p>
 
+    <p>An optional third argument <var>username:password</var> may be
+    given, which defines the Basic authentication credentials to pass
+    to the configured remote proxy.  The credentials will always be
+    sent without first waiting for the remote proxy to send a Basic
+    authentication challenge.  The <a href="mod_proxy_http.html#env">Proxy-Chain-Auth</a> environment
+    variable has no effect if this argument is used.</p>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyRemoteMatch" id="ProxyRemoteMatch">ProxyRemoteMatch</a> <a name="proxyremotematch" id="proxyremotematch">Directive</a> <a title="Permanent link" href="#proxyremotematch" class="permalink">&para;</a></h2>

diff --git a/docs/manual/mod/quickreference.html.en.utf8 b/docs/manual/mod/quickreference.html.en.utf8
index 9298ce0882b87b7bee1fa3c9e00d5e8c55d5af20..ea3fc260e1c43224de509c32aed10a25d83cc804 100644 (file)
--- a/docs/manual/mod/quickreference.html.en.utf8
+++ b/docs/manual/mod/quickreference.html.en.utf8
@@ -898,7 +898,7 @@ proxied server</td></tr>
 request</td></tr>
 <tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var> [<var>username:password</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
 <tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>

diff --git a/docs/manual/new_features_2_0.html b/docs/manual/new_features_2_0.html
index 915f80781c7b7d05594978becc93a473e4862f7a..d56058718971a50d8b59604ae1d05f4db4605339 100644 (file)
--- a/docs/manual/new_features_2_0.html
+++ b/docs/manual/new_features_2_0.html
@@ -4,9 +4,9 @@ URI: new_features_2_0.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
 
-URI: new_features_2_0.html.en
+URI: new_features_2_0.html.en.utf8
 Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
+Content-type: text/html; charset=UTF-8
 
 URI: new_features_2_0.html.fr.utf8
 Content-Language: fr
@@ -26,7 +26,7 @@ Content-type: text/html; charset=ISO-8859-1
 
 URI: new_features_2_0.html.ru.utf8
 Content-Language: ru
-Content-type: text/html; charset=utf-8
+Content-type: text/html; charset=UTF-8
 
 URI: new_features_2_0.html.tr.utf8
 Content-Language: tr

diff --git a/docs/manual/new_features_2_0.xml.meta b/docs/manual/new_features_2_0.xml.meta
index d91a0fac8ce8c036b53b3b05d9e14b387c0a11d9..50db4eca7d47b805880d3e9035f14eb8cbe650ee 100644 (file)
--- a/docs/manual/new_features_2_0.xml.meta
+++ b/docs/manual/new_features_2_0.xml.meta
@@ -13,7 +13,7 @@
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">pt-br</variant>
-    <variant outdated="yes">ru</variant>
+    <variant htmlonly="yes">ru</variant>
     <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/rewrite/flags.html.en.utf8 b/docs/manual/rewrite/flags.html.en.utf8
index e29bd87a9a85f22658b55041b2e9023077290502..f8896010fcc13677a1f38cbe62624022559fc690 100644 (file)
--- a/docs/manual/rewrite/flags.html.en.utf8
+++ b/docs/manual/rewrite/flags.html.en.utf8
@@ -201,7 +201,7 @@ which means that the cookie is inaccessible to JavaScript code on
 browsers that support this feature.</dd>
 
 <dt>samesite</dt>
-<dd>If set to anything other than <code>0</code>, the <code>SameSite</code>
+<dd>If set to anything other than <code>false</code> or <code>0</code>, the <code>SameSite</code>
 attribute is set to the specified value.  Typical values are <code>None</code>,
 <code>Lax</code>, and <code>Strict</code>.Available in 2.5.1 and later.</dd>
 </dl>