diff options
| -rw-r--r-- | docs/manual/install.html.en | 4 | ||||
| -rw-r--r-- | docs/manual/install.xml.de | 2 | ||||
| -rw-r--r-- | docs/manual/install.xml.es | 2 | ||||
| -rw-r--r-- | docs/manual/install.xml.fr | 2 | ||||
| -rw-r--r-- | docs/manual/install.xml.ja | 2 | ||||
| -rw-r--r-- | docs/manual/install.xml.ko | 2 | ||||
| -rw-r--r-- | docs/manual/mod/core.html.en | 32 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml.de | 2 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml.ja | 2 | ||||
| -rw-r--r-- | docs/manual/new_features_2_2.html.en | 42 | ||||
| -rw-r--r-- | docs/manual/new_features_2_2.xml.ko | 2 | ||||
| -rw-r--r-- | docs/manual/new_features_2_2.xml.pt-br | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html | 4 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.de | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.ja.euc-jp | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.ko.euc-kr | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.pt-br | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.ru.koi8-r | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.xml.meta | 1 |
20 files changed, 63 insertions, 50 deletions
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 7f59fa53d9..16e5ab16d1 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -70,8 +70,8 @@ <td><a href="#extract">Extract</a></td> <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br /> - $ tar xvf httpd-<em>NN</em>.tar</code><br /> - $ cd httpd-<em>NN</em></td> + $ tar xvf httpd-<em>NN</em>.tar<br /> + $ cd httpd-<em>NN</em></code></td> </tr> <tr> diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index 3cefc4c032..5086df1165 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?> -<!-- English Revision: 239255:344411 (outdated) --> +<!-- English Revision: 239255:349753 (outdated) --> <!-- Copyright 2002-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es index 2a302c40fd..af3bc883c8 100644 --- a/docs/manual/install.xml.es +++ b/docs/manual/install.xml.es @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?> -<!-- English Revision: 105989:344411 (outdated) --> +<!-- English Revision: 105989:349753 (outdated) --> <!-- Copyright 2004-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr index f54cd2c19a..f58ec1a986 100644 --- a/docs/manual/install.xml.fr +++ b/docs/manual/install.xml.fr @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='ISO-8859-1' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> -<!-- English Revision: 105989:344411 (outdated) --> +<!-- English Revision: 105989:349753 (outdated) --> <!-- Copyright 2004-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja index 1c1ff871cd..ee87d12423 100644 --- a/docs/manual/install.xml.ja +++ b/docs/manual/install.xml.ja @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='iso-2022-jp' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?> -<!-- English Revision: 178520:344411 (outdated) --> +<!-- English Revision: 178520:349753 (outdated) --> <!-- Copyright 2002-2005 The Apache Software Foundation or its licensors, as diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko index 9b1f92ed42..82ee03b5bf 100644 --- a/docs/manual/install.xml.ko +++ b/docs/manual/install.xml.ko @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='EUC-KR' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?> -<!-- English Revision: 105989:344411 (outdated) --> +<!-- English Revision: 105989:349753 (outdated) --> <!-- Copyright 2003-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 84575be689..310d261e5d 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -2409,7 +2409,7 @@ a resource</td></tr> <p>This directive selects which authenticated users can access a resource. The restrictions are processed by authorization modules. Some of the allowed syntaxes provided by - <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> and + <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> and <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> are:</p> <dl> @@ -2451,6 +2451,36 @@ a resource</td></tr> place the <code class="directive">Require</code> statement into a <code class="directive"><a href="#limit"><Limit></a></code> section.</p> + + <p>If <code class="directive">Require</code> is used together with + the <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> or + <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> directives, + then the interaction of these restrictions is controlled by + the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive.</p> + + <div class="note"><h3>Removing controls in subdirectories</h3> + <p>The following example shows how to use the <code class="directive"><a href="#satisfy">Satisfy</a></code> directive to disable access + controls in a subdirectory of a protected directory. This + technique should be used with caution, because it will also + disable any access controls imposed by + <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p> + <div class="example"><p><code> + <Directory /path/to/protected/><br /> + <span class="indent"> + Require user david<br /> + </span> + </Directory><br /> + <Directory /path/to/protected/unprotected><br /> + <span class="indent"> + # All access controls and authentication are disabled<br /> + # in this directory<br /> + Satisfy Any<br /> + Allow from all<br /> + </span> + </Directory><br /> + </code></p></div> + </div> + <h3>See also</h3> <ul> diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index cc2395cdf9..d31da1ca6c 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?> -<!-- English Revision: 167959:349476 (outdated) --> +<!-- English Revision: 167959:349776 (outdated) --> <!-- Copyright 2003-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 910e844bd3..b89dc369a6 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.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: 190982:349476 (outdated) --> +<!-- English Revision: 190982:349776 (outdated) --> <!-- Copyright 2003-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en index bbb784f5e9..3b20184941 100644 --- a/docs/manual/new_features_2_2.html.en +++ b/docs/manual/new_features_2_2.html.en @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><!-- +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> <title>Overview of new features in Apache 2.2 - Apache HTTP Server</title> -<link title="Main stylesheet" type="text/css" media="all" rel="stylesheet" href="./style/css/manual.css" /> -<link title="No Sidebar - Default font size" type="text/css" media="all" rel="alternate stylesheet" href="./style/css/manual-loose-100pc.css" /> -<link type="text/css" media="print" rel="stylesheet" href="./style/css/manual-print.css" /> -<link rel="shortcut icon" href="./images/favicon.ico" /></head> +<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> +<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> +<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /> +<link href="./images/favicon.ico" rel="shortcut icon" /></head> <body id="manual-page"><div id="page-header"> <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p> <p class="apache">Apache HTTP Server Version 2.3</p> -<img src="./images/feather.gif" alt="" /></div> -<div class="up"><a href="./"><img src="./images/left.gif" alt="<-" title="<-" /></a></div> +<img alt="" src="./images/feather.gif" /></div> +<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div> <div id="path"> <a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.3</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache 2.2</h1> <div class="toplang"> @@ -28,14 +28,14 @@ version 1.3, see the <a href="new_features_2_0.html">2.0 new features</a> document.</p> </div> -<div id="quickview"><ul id="toc"><li><img src="./images/down.gif" alt="" /> <a href="#core">Core Enhancements</a></li> -<li><img src="./images/down.gif" alt="" /> <a href="#module">Module Enhancements</a></li> -<li><img src="./images/down.gif" alt="" /> <a href="#programs">Program Enhancements</a></li> -<li><img src="./images/down.gif" alt="" /> <a href="#developer">Module Developer Changes</a></li> +<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li> +<li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li> +<li><img alt="" src="./images/down.gif" /> <a href="#programs">Program Enhancements</a></li> +<li><img alt="" src="./images/down.gif" /> <a href="#developer">Module Developer Changes</a></li> </ul></div> -<div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div> +<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> -<h2><a id="core" name="core">Core Enhancements</a></h2> +<h2><a name="core" id="core">Core Enhancements</a></h2> <dl> @@ -115,9 +115,9 @@ </dd> </dl> - </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> -<h2><a id="module" name="module">Module Enhancements</a></h2> +<h2><a name="module" id="module">Module Enhancements</a></h2> <dl> <dt>Authn/Authz</dt> @@ -156,9 +156,9 @@ user confusion.</dd> </dl> - </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> -<h2><a id="programs" name="programs">Program Enhancements</a></h2> +<h2><a name="programs" id="programs">Program Enhancements</a></h2> <dl> <dt><code class="program"><a href="./programs/httpd.html">httpd</a></code></dt> @@ -171,12 +171,12 @@ for use in <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> with the <code>dbm</code> map type.</dd> </dl> - </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> -<h2><a id="developer" name="developer">Module Developer Changes</a></h2> +<h2><a name="developer" id="developer">Module Developer Changes</a></h2> <dl> - <dt><a href="./glossary.html#apr" class="glossarylink" title="see glossary">APR</a> 1.0 API</dt> + <dt><a class="glossarylink" href="./glossary.html#apr" title="see glossary">APR</a> 1.0 API</dt> <dd>Apache 2.2 uses the APR 1.0 API. All deprecated functions and symbols have been removed from <code>APR</code> and @@ -261,4 +261,4 @@ </div><div id="footer"> <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p> <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div> -</body></html> +</body></html>
\ No newline at end of file diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko index 1dfb4ef624..21678fcf03 100644 --- a/docs/manual/new_features_2_2.xml.ko +++ b/docs/manual/new_features_2_2.xml.ko @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='EUC-KR' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?> -<!-- English Revision: 105989:345708 (outdated) --> +<!-- English Revision: 105989:349736 (outdated) --> <!-- Copyright 2004-2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br index 5b795b6c6d..61eb18b699 100644 --- a/docs/manual/new_features_2_2.xml.pt-br +++ b/docs/manual/new_features_2_2.xml.pt-br @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8' ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?> -<!-- English Revision: 151408:345708 (outdated) --> +<!-- English Revision: 151408:349736 (outdated) --> <!-- Copyright 2005 The Apache Software Foundation or its licensors, diff --git a/docs/manual/upgrading.html b/docs/manual/upgrading.html index 35b0339c8f..e32040eca5 100644 --- a/docs/manual/upgrading.html +++ b/docs/manual/upgrading.html @@ -6,10 +6,6 @@ URI: upgrading.html.en Content-Language: en Content-type: text/html; charset=ISO-8859-1 -URI: upgrading.html.fr -Content-Language: fr -Content-type: text/html; charset=ISO-8859-1 - URI: upgrading.html.ja.euc-jp Content-Language: ja Content-type: text/html; charset=EUC-JP diff --git a/docs/manual/upgrading.html.de b/docs/manual/upgrading.html.de index 56b8555f57..36228f5382 100644 --- a/docs/manual/upgrading.html.de +++ b/docs/manual/upgrading.html.de @@ -20,7 +20,6 @@ <div class="toplang"> <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | @@ -102,7 +101,6 @@ <div class="bottomlang"> <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index 69d90bfd00..f3af97b7ca 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -20,7 +20,6 @@ <div class="toplang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | @@ -70,7 +69,6 @@ <div class="bottomlang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.html.ja.euc-jp b/docs/manual/upgrading.html.ja.euc-jp index fad594afbb..1c60ac96f0 100644 --- a/docs/manual/upgrading.html.ja.euc-jp +++ b/docs/manual/upgrading.html.ja.euc-jp @@ -21,7 +21,6 @@ <div class="toplang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran«®ais"> fr </a> | <a href="./ja/upgrading.html" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu«´s (Brasil)"> pt-br </a> | @@ -214,7 +213,6 @@ <div class="bottomlang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran«®ais"> fr </a> | <a href="./ja/upgrading.html" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu«´s (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.html.ko.euc-kr b/docs/manual/upgrading.html.ko.euc-kr index ee2fff2665..b52d999638 100644 --- a/docs/manual/upgrading.html.ko.euc-kr +++ b/docs/manual/upgrading.html.ko.euc-kr @@ -20,7 +20,6 @@ <div class="toplang"> <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | @@ -195,7 +194,6 @@ <div class="bottomlang"> <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.html.pt-br b/docs/manual/upgrading.html.pt-br index 1c679cdff4..62aa40418a 100644 --- a/docs/manual/upgrading.html.pt-br +++ b/docs/manual/upgrading.html.pt-br @@ -20,7 +20,6 @@ <div class="toplang"> <p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" title="Português (Brasil)"> pt-br </a> | @@ -216,7 +215,6 @@ <div class="bottomlang"> <p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" title="Português (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.html.ru.koi8-r b/docs/manual/upgrading.html.ru.koi8-r index d3b9803749..2fd31e367f 100644 --- a/docs/manual/upgrading.html.ru.koi8-r +++ b/docs/manual/upgrading.html.ru.koi8-r @@ -20,7 +20,6 @@ <div class="toplang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | @@ -192,7 +191,6 @@ <div class="bottomlang"> <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> | <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | -<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)"> pt-br </a> | diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta index f4c18ef596..636b2b1051 100644 --- a/docs/manual/upgrading.xml.meta +++ b/docs/manual/upgrading.xml.meta @@ -8,7 +8,6 @@ <variants> <variant outdated="yes">de</variant> <variant>en</variant> - <variant htmlonly="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">pt-br</variant> |