From: André Malo Date: Sun, 19 Jun 2011 11:45:57 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.2.20~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b12e4f062f734d1e422e64012f8431bcd16a785d;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1137349 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index 40858a0e8e7..cb8738aa764 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2007-04-24" "Apache HTTP Server" "htpasswd" +.TH "HTPASSWD" 1 "2011-06-19" "Apache HTTP Server" "htpasswd" .SH NAME htpasswd \- Manage user files for basic authentication @@ -68,10 +68,10 @@ Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritt Display the results on standard output rather than updating a file\&. This is useful for generating password records acceptable to Apache for inclusion in non-text data stores\&. This option changes the syntax of the command line, since the \fIpasswdfile\fR argument (usually the first one) is omitted\&. It cannot be combined with the -c option\&. .TP -m -Use MD5 encryption for passwords\&. On Windows, Netware and TPF, this is the default\&. +Use MD5 encryption for passwords\&. This is the default\&. .TP -d -Use crypt() encryption for passwords\&. The default on all platforms but Windows, Netware and TPF\&. Though possibly supported by htpasswd on all platforms, it is not supported by the httpd server on Windows, Netware and TPF\&. +Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware and TPF\&. .TP -s Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. @@ -105,7 +105,7 @@ htpasswd returns a zero status ("true") if the username and password have been s .fi .PP -Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. If executed on a Windows system, the password will be encrypted using the modified Apache MD5 algorithm; otherwise, the system's crypt() routine will be used\&. If the file does not exist, htpasswd will do nothing except return an error\&. +Adds or modifies the password for user jsmith\&. The user is prompted for the password\&. The password will be encrypted using the modified Apache MD5 algorithm\&. If the file does not exist, htpasswd will do nothing except return an error\&. .nf @@ -118,12 +118,12 @@ Creates a new file and stores a record in it for user jane\&. The user is prompt .nf - htpasswd -mb /usr/web/\&.htpasswd-all jones Pwd4Steve + htpasswd -db /usr/web/\&.htpasswd-all jones Pwd4Steve .fi .PP -Encrypts the password from the command line (Pwd4Steve) using the MD5 algorithm, and stores it in the specified file\&. +Encrypts the password from the command line (Pwd4Steve) using the crypt() algorithm, and stores it in the specified file\&. .SH "SECURITY CONSIDERATIONS" diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 33404b1bc39..d10851a79e4 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -398,6 +398,7 @@ sslverifydepth mod/mod_ssl.html#sslverifydepth startservers mod/mpm_common.html#startservers startthreads mod/mpm_common.html#startthreads substitute mod/mod_substitute.html#substitute +suexec mod/core.html#suexec suexecusergroup mod/mod_suexec.html#suexecusergroup threadlimit mod/mpm_common.html#threadlimit threadsperchild mod/mpm_common.html#threadsperchild diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 24459f06e77..54256835fd3 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -3235,7 +3235,7 @@ bevor er die Anfrage abbricht requests Syntax:TraceEnable [on|off|extended] Voreinstellung:TraceEnable on -Kontext:Serverkonfiguration +Kontext:Serverkonfiguration, Virtual Host Status:Core Modul:core Kompatibilität:Available in Apache 1.3.34, 2.0.55 and later diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index b646c2ae1f2..7b8b33cc815 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -3361,7 +3361,7 @@ certain events before failing a request requests Syntax:TraceEnable [on|off|extended] Default:TraceEnable on -Context:server config +Context:server config, virtual host Status:Core Module:core Compatibility:Available in Apache 1.3.34, 2.0.55 and later diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 223bded930c..6ee91f43302 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -2504,10 +2504,11 @@ nom obligatoire si vous envisagez de configurer des serveurs virtuels par nom.

Bien que adresse puisse être un nom d'hôte, il est - recommandé d'utiliser plutôt une adresse IP, comme

+ recommandé d'utiliser plutôt une adresse IP et un port, + dans le style

- NameVirtualHost 111.22.33.44 + NameVirtualHost 111.22.33.44:80

La directive NameVirtualHost vous permet @@ -2560,8 +2561,8 @@ nom l'argument de la directive NameVirtualHost.

- NameVirtualHost 1.2.3.4
- <VirtualHost 1.2.3.4>
+ NameVirtualHost 1.2.3.4:80
+ <VirtualHost 1.2.3.4:80>
# ...
</VirtualHost>

@@ -3609,7 +3610,7 @@ appropri TRACE Syntaxe:TraceEnable [on|off|extended] Défaut:TraceEnable on -Contexte:configuration du serveur +Contexte:configuration du serveur, serveur virtuel Statut:Core Module:core Compatibilité:Disponible dans les versions 1.3.34, 2.0.55 et @@ -3798,7 +3799,7 @@ d'h

Exemple

- <VirtualHost 10.1.2.3>
+ <VirtualHost 10.1.2.3:80>
ServerAdmin webmaster@host.example.com
DocumentRoot /www/docs/host.example.com
@@ -3816,7 +3817,7 @@ d'h :

- <VirtualHost [2001:db8::a00:20ff:fea7:ccea]>
+ <VirtualHost [2001:db8::a00:20ff:fea7:ccea]:80>
ServerAdmin webmaster@host.example.com
DocumentRoot /www/docs/host.example.com
diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index a72092e2820..52952e4f55b 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -27,6 +27,7 @@  ja  |  tr 

+
Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.
Açıklama:Apache HTTP Sunucusunda daima mevcut olan çekirdek özellikler
Durum:Çekirdek
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 2d6891e3130..0cecddc35b0 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + +