From: Daniel Gruno
Date: Fri, 10 May 2013 08:13:21 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.2.25~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff53ec58517c80da421123382ecc459b53a7218;p=thirdparty%2Fapache%2Fhttpd.git
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1480920 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index ea9ceaf5e51..1acfca704cc 100644
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -264,7 +264,7 @@ changes on a per-directory basis.
As discussed in the documentation on Configuration Sections,
.htaccess
files can override the <Directory>
sections for
- the corresponding directory, but will be overriden by other types
+ the corresponding directory, but will be overridden by other types
of configuration sections from the main configuration files. This
fact can be used to enforce certain configurations, even in the
presence of a liberal AllowOverride
setting. For example, to
diff --git a/docs/manual/howto/htaccess.html.fr b/docs/manual/howto/htaccess.html.fr
index b522004c177..1ef7818dcf1 100644
--- a/docs/manual/howto/htaccess.html.fr
+++ b/docs/manual/howto/htaccess.html.fr
@@ -27,6 +27,8 @@
ko |
pt-br
+Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.
Les fichiers .htaccess
fournissent une méthode pour
modifier la configuration du serveur au niveau de chaque répertoire.
diff --git a/docs/manual/howto/htaccess.xml.fr b/docs/manual/howto/htaccess.xml.fr
index e2a2ebfee76..70b692c630d 100644
--- a/docs/manual/howto/htaccess.xml.fr
+++ b/docs/manual/howto/htaccess.xml.fr
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
index 65ca7a64ce1..62406491841 100644
--- a/docs/manual/howto/htaccess.xml.ja
+++ b/docs/manual/howto/htaccess.xml.ja
@@ -1,7 +1,7 @@
-
+
+
+
+