You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/12/12 17:32:36 UTC
svn commit: r1420812 [2/2] - in /httpd/httpd/branches/2.4.x/docs: man/
manual/ manual/misc/ manual/mod/ manual/programs/
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.fr?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.fr Wed Dec 12 16:32:22 2012
@@ -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 : 758944 -->
+<!-- English Revision: 758944:1420732 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.meta?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.meta Wed Dec 12 16:32:22 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
- <variant>tr</variant>
+ <variant outdated="yes">fr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.tr?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htdbm.xml.tr [utf-8] Wed Dec 12 16:32:22 2012
@@ -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.tr.xsl"?>
-<!-- English Revision: 758944 -->
+<!-- English Revision: 758944:1420732 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.en?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.en Wed Dec 12 16:32:22 2012
@@ -37,13 +37,16 @@
just the users listed in the files created by <code>htpasswd</code>. This
program can only manage usernames and passwords stored in a flat-file. It
can encrypt and display password information for use in other types of data
- stores, though. To use a DBM database see <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code>.</p>
+ stores, though. To use a DBM database see <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> or
+ <code class="program"><a href="../programs/htdbm.html">htdbm</a></code>.</p>
- <p><code>htpasswd</code> encrypts passwords using either a version of MD5
- modified for Apache, or the system's <code>crypt()</code> routine. Files
- managed by <code>htpasswd</code> may contain both types of passwords; some
- user records may have MD5-encrypted passwords while others in the same file
- may have passwords encrypted with <code>crypt()</code>.</p>
+ <p><code>htpasswd</code> encrypts passwords using either bcrypt,
+ a version of MD5 modified for Apache, SHA1, or the system's
+ <code>crypt()</code> routine. Files
+ managed by <code>htpasswd</code> may contain a mixture of different encoding
+ types of passwords; some
+ user records may have bcrypt or MD5-encrypted passwords while others in the
+ same file may have passwords encrypted with <code>crypt()</code>.</p>
<p>This manual page only lists the command line arguments. For details of
the directives necessary to configure user authentication in
@@ -56,36 +59,50 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#security">Security Considerations</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#restrictions">Restrictions</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="../programs/httpd.html">httpd</a></code></li><li>The scripts in support/SHA1 which come with the
+</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="../programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="../programs/htdbm.html">htdbm</a></code></li><li>The scripts in support/SHA1 which come with the
distribution.</li></ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="synopsis" id="synopsis">Synopsis</a></h2>
<p><code><strong>htpasswd</strong>
[ -<strong>c</strong> ]
- [ -<strong>m</strong> ]
- [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var></code></p>
+ [ -<strong>i</strong> ]
+ [ -<strong>m</strong> |
+ -<strong>B</strong> |
+ -<strong>d</strong> |
+ -<strong>s</strong> |
+ -<strong>p</strong> ]
+ [ -<strong>C</strong> <var>cost</var> ]
+ [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var></code></p>
<p><code><strong>htpasswd</strong> -<strong>b</strong>
[ -<strong>c</strong> ]
[ -<strong>m</strong> |
+ -<strong>B</strong> |
-<strong>d</strong> |
- -<strong>p</strong> |
- -<strong>s</strong> ]
+ -<strong>s</strong> |
+ -<strong>p</strong> ]
+ [ -<strong>C</strong> <var>cost</var> ]
[ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var>
<var>password</var></code></p>
<p><code><strong>htpasswd</strong> -<strong>n</strong>
+ [ -<strong>i</strong> ]
[ -<strong>m</strong> |
+ -<strong>B</strong> |
-<strong>d</strong> |
-<strong>s</strong> |
- -<strong>p</strong> ] <var>username</var></code></p>
+ -<strong>p</strong> ]
+ [ -<strong>C</strong> <var>cost</var> ] <var>username</var></code></p>
<p><code><strong>htpasswd</strong> -<strong>nb</strong>
[ -<strong>m</strong> |
+ -<strong>B</strong> |
-<strong>d</strong> |
-<strong>s</strong> |
- -<strong>p</strong> ] <var>username</var> <var>password</var></code></p>
+ -<strong>p</strong> ]
+ [ -<strong>C</strong> <var>cost</var> ] <var>username</var>
+ <var>password</var></code></p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="options" id="options">Options</a></h2>
@@ -94,7 +111,10 @@ distribution.</li></ul><ul class="seeals
<dd>Use batch mode; <em>i.e.</em>, get the password from the command line
rather than prompting for it. This option should be used with extreme care,
since <strong>the password is clearly visible</strong> on the command
- line.</dd>
+ line. For script use see the <code>-i</code> option.</dd>
+
+ <dt><code>-i</code></dt>
+ <dd>Read the password from stdin without verification (for script usage).</dd>
<dt><code>-c</code></dt>
<dd>Create the <var>passwdfile</var>. If <var>passwdfile</var> already
@@ -111,6 +131,15 @@ distribution.</li></ul><ul class="seeals
<dt><code>-m</code></dt>
<dd>Use MD5 encryption for passwords. This is the default.</dd>
+ <dt><code>-B</code></dt>
+ <dd>Use bcrypt encryption for passwords. This is currently considered to
+ be very secure.</dd>
+
+ <dt><code>-C</code></dt>
+ <dd>This flag is only allowed in combination with <code>-B</code> (bcrypt
+ encryption). It sets the computing time used for the bcrypt algorithm
+ (higher is more secure but slower, default: 5, valid: 4 to 31).</dd>
+
<dt><code>-d</code></dt>
<dd>Use <code>crypt()</code> encryption for passwords. This is not
supported by the <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.fr?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.html.fr Wed Dec 12 16:32:22 2012
@@ -28,6 +28,8 @@ l'authentification de base</h1>
<a href="../ko/programs/htpasswd.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/programs/htpasswd.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p><code>htpasswd</code> permet de créer et de maintenir les
fichiers textes où sont stockés les noms d'utilisateurs et mots de
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.fr?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.fr Wed Dec 12 16:32:22 2012
@@ -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 : 1365528 -->
+<!-- English Revision: 1365528:1420732 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.ko?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.ko [euc-kr] Wed Dec 12 16:32:22 2012
@@ -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:1365528 (outdated) -->
+<!-- English Revision: 105989:1420732 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.meta?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.meta Wed Dec 12 16:32:22 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
</variants>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.tr?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml.tr [utf-8] Wed Dec 12 16:32:22 2012
@@ -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.tr.xsl"?>
-<!-- English Revision: 1174747:1365528 (outdated) -->
+<!-- English Revision: 1174747:1420732 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/log_server_status.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/log_server_status.html.en?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/log_server_status.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/log_server_status.html.en Wed Dec 12 16:32:22 2012
@@ -22,6 +22,7 @@
<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>log_server_status - Log periodic status summaries</h1>
<div class="toplang">
<p><span>Available Languages: </span><a href="../en/programs/other.html" title="English"> en </a> |
+<a href="../fr/programs/other.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/programs/other.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/programs/other.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
@@ -59,6 +60,7 @@ which can then be used for statistical a
</div></div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/programs/other.html" title="English"> en </a> |
+<a href="../fr/programs/other.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/programs/other.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/programs/other.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </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&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again 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="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/split-logfile.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/split-logfile.html.en?rev=1420812&r1=1420811&r2=1420812&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/split-logfile.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/split-logfile.html.en Wed Dec 12 16:32:22 2012
@@ -22,6 +22,7 @@
<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.4</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>split-logfile - Split up multi-vhost logfiles</h1>
<div class="toplang">
<p><span>Available Languages: </span><a href="../en/programs/other.html" title="English"> en </a> |
+<a href="../fr/programs/other.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/programs/other.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/programs/other.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
@@ -58,6 +59,7 @@ CustomLog logs/access_log combined_plus_
</div></div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/programs/other.html" title="English"> en </a> |
+<a href="../fr/programs/other.html" hreflang="fr" rel="alternate" title="Français"> fr </a> |
<a href="../ko/programs/other.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/programs/other.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </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&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again 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="http://httpd.apache.org/lists.html">mailing lists</a>.</div>