Restore contents of this file.

Perhaps Justin accidentaly copied wrong one when he renamed
mod_access.xml.ja to mod_authz_host.xml.ja.
(It's no big deal.  It's solved by simple merge.)


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

1 files changed, 32 insertions, 132 deletions

diff --git a/docs/manual/mod/mod_auth_basic.xml.ja b/docs/manual/mod/mod_auth_basic.xml.ja
index 0f1e4ea0c8..42df7b5499 100644
--- a/docs/manual/mod/mod_auth_basic.xml.ja
+++ b/docs/manual/mod/mod_auth_basic.xml.ja
@@ -2,140 +2,62 @@
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
 <modulesynopsis>
+<!-- English revision: 1.1 -->
 
-<!-- English revision: 1.6 -->
-<name>mod_auth</name>
-<description>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<%6G'>Z(B</description>
+<name>mod_auth_basic</name>
+<description>$B4pK\G'>Z(B</description>
 <status>Base</status>
-<sourcefile>mod_auth.c</sourcefile>
-<identifier>auth_module</identifier>
+<sourcefile>mod_auth_basic.c</sourcefile>
+<identifier>auth_basic_module</identifier>
+<compatibility>Apache 2.0.42 $B0J9_(B</compatibility>
 
 <summary>
 
-    <p>$B%W%l%$%s%F%-%9%H$N%Q%9%o!<%I%U%!%$%k$H%0%k!<%W%U%!%$%k$r8!::$7$F(B
-    $B%f!<%6$rC5$9$3$H$G!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$7$^$9!#(B
-    $B;w$?$h$&$J5!G=$G!"$b$C$HBg$-$J%9%1!<%i%S%j%F%#$r;}$C$?$b$N$O!"(B
-    <module>mod_auth_dbm</module> $B$GDs6!$5$l$F$$$^$9!#(B
-    $B$^$?!"(BHTTP $B%@%$%8%'%9%HG'>Z$O(B <module>mod_auth_digest</module>
-    $B$GDs6!$5$l$F$$$^$9!#(B</p>
+    <p>$BM?$($i$l$?%W%m%P%$%@(B ($BLuCm(B: $BG'>Z$G$N>H2q$r9T$&Ld$$9g$o$;@h(B) 
+    $B$G%f!<%6$r8!:w$7!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$J$j$^$9!#(B
+    HTTP $B%@%$%8%'%9%HG'>Z$K$D$$$F$O(B <module>mod_auth_digest</module>
+    $B$GDs6!$5$l$^$9!#(B</p>
 
 </summary>
-<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
 <seealso><directive module="core">AuthName</directive></seealso>
 <seealso><directive module="core">AuthType</directive></seealso>
 
 <directivesynopsis>
-<name>AuthGroupFile</name>
-<description>$BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
-$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</description>
-<syntax>AuthGroupFile <em>file-path</em></syntax>
-<contextlist><context>$B%G%#%l%/%H%j(B</context><context>.htaccess</context>
+<name>AuthBasicProvider</name>
+<description>$B$3$N0LCV$KBP$9$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</description>
+<syntax>AuthBasicProvider <em>provider-name</em></syntax>
+<contextlist>
+  <context>$B%G%#%l%/%H%j(B</context>
+  <context>$B%m%1!<%7%g%s(B</context>
+  <context>.htaccess</context>
 </contextlist>
 <override>AuthConfig</override>
 
 <usage>
-    <p><directive>AuthGroupFile</directive> $B%G%#%l%/%F%#%V$O!"(B
-    $BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
-    $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
-    <em>file-path</em> $B$O%0%k!<%W%U%!%$%k$X$N%Q%9$G$9!#(B
-    $B$b$7@dBP%Q%9$G$J$1$l$P(B
-    (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
-    $B!"(B<directive module="core">ServerRoot</directive>
-    $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
+    <p><directive>AuthBasicProvider</directive> $B%G%#%l%/%F%#%V$G!"(B
+    $B$3$N0LCV$KBP$9$k%f!<%6G'>Z$KMQ$$$i$l$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</p>
 
-    <p>$B%0%k!<%W%U%!%$%k3F9T$O!"%0%k!<%WL>!"%3%m%s!"$=$7$F(B
-    $B%9%Z!<%96h@Z$j$G$=$N%a%s%P!<$N%f!<%6L>$r5-=R$7$^$9!#(B
-    $BNc$($P(B:</p>
-
-<example>mygroup: bob joe anne</example> 
-
-    <p>$BBg$-$J%U%!%$%k$rC5:w$9$k$N$O!"(B<em>$BHs>o$K(B</em>$B8zN($,0-$$$H$$$&E@$K(B
-    $BCm0U$7$F$/$@$5$$!#$=$N$h$&$J>l9g$O!"(B
-    <directive module="mod_auth_dbm">AuthDBMGroupFile</directive>
-    $B$rBe$o$j$K;H$&$Y$-$G$7$g$&!#(B</p>
-
-<note><title>$B%;%-%e%j%F%#(B</title>
-    <p><directive>AuthGroupFile</directive> $B$O!"(B
-    $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$K(B
-    $BJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
-    $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
-    $B$=$&$7$J$$$H(B <directive>AuthGroupFile</directive> $B$O(B
-    $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p>
-</note>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthUserFile</name>
-<description>$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
-$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</description>
-<syntax>AuthUserFile <em>file-path</em></syntax>
-<contextlist><context>$B%G%#%l%/%H%j(B</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
-    <p><directive>AuthUserFile</directive> $B%G%#%l%/%F%#%V$O!"(B
-    $B%f!<%6G'>Z$N$?$a$N%f!<%6$H%Q%9%o!<%I$N0lMw$r3JG<$7$?(B
-    $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B<em>file-path</em>
-    $B$O%f!<%6%U%!%$%k$X$N%Q%9$G$9!#(B
-    $B$b$7@dBP%Q%9$G$J$1$l$P(B
-    (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
-    $B!"(B<directive module="core">ServerRoot</directive>
-    $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
-
-    <p>$B%f!<%6%U%!%$%k$N3F9T$K$O!"%f!<%6L>!"%3%m%s!"(B
-    <code>crypt()</code> $B$G0E9f2=$7$?%Q%9%o!<%I$r5-=R$7$^$9!#(B
-    $BF10l%f!<%6$,J#?t2sEPO?$5$l$?;~$N5sF0$ODj5A$5$l$F$$$^$;$s!#(B</p>
-
-    <p>$B%P%$%J%jG[I[$N0lIt$H$7$F%$%s%9%H!<%k$5$l$k$+!"(B
-    $B$"$k$$$O(B <code>src/support</code> $B$K$"$k(B
-    <a href="../programs/htpasswd.html">htpasswd</a>
-    $B%f!<%F%#%j%F%#$G!"$3$N%Q%9%o!<%I%U%!%$%k$r%a%$%s%F%J%s%9$7$^$9!#(B
-    $B>\:Y$O(B <code>man</code> $B%Z!<%8$r$4MwD:$/$H$7$F!"4JC1$K$O(B:</p>
-
-    <p>$B=i4|(B ID username $B$G!"(BFilename
-    $B$H$$$&%Q%9%o!<%I%U%!%$%k$r@8@.$7$^$9!#(B
-    $B<!$N%3%^%s%I$rH/9T$9$k$H%Q%9%o!<%I$,MW5a$5$l$^$9(B:</p>
-<example>htpasswd -c Filename username</example>
-
-    <p>$B%Q%9%o!<%I%U%!%$%k(B Filename $B$K!"(Busername2
-    $B$rDI2C$7$?$j=$@5$7$?$j$7$^$9(B:</p>
-<example>htpasswd Filename username2</example>
-
-    <p>($BLuCm(B: $BHs>o$KB?$/$N%f!<%6$rEPO?$9$k$HBg$-$J%U%!%$%k$K$J$j$^$9$,(B)
-    $BBg$-$J%F%-%9%H%U%!%$%k$r8!:w$9$k$N$O(B<em>$BHs>o$K(B</em>$B8zN($,0-$$(B
-    $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$=$N$h$&$JI,MW$N$"$k;~$O!"(B
-    <directive module="mod_auth_dbm">AuthDBMUserFile</directive>
-    $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B</p>
-
-<note><title>$B%;%-%e%j%F%#(B</title>
-    <p><directive>AuthUserFile </directive>
-        $B$O!"%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
-        $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
-        $B$=$&$7$J$$$H(B <directive>AuthUserFile</directive> $B$O(B
-        $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p></note>
+    <p>$BG'>Z%W%m%P%$%@$K$D$$$F$O(B
+    <module>mod_authn_dbm</module>, <module>mod_authn_file</module>
+    $B$r$4Mw2<$5$$!#(B</p>
 
 </usage>
 </directivesynopsis>
 
 <directivesynopsis>
-<name>AuthAuthoritative</name>
-<description>$BG'>Z$H>5G'%W%m%;%9$r!"(B
-$B$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$I$&$+$r@_Dj$9$k(B</description>
-<syntax>AuthAuthoritative on|off</syntax>
-<default>AuthAuthoritative on</default>
-<contextlist><context>$B%G%#%l%/%H%j(B</context><context>.htaccess</context>
+<name>AuthBasicAuthoritative</name>
+<description>$BG'>Z$H>5G'$r!"$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$r(B
+$B@_Dj$7$^$9!#(B</description>
+<syntax>AuthBasicAuthoritative on|off</syntax>
+<default>AuthBasicAuthoritative on</default>
+<contextlist>
+  <context>$B%G%#%l%/%H%j(B</context>
+  <context>.htaccess</context>
 </contextlist>
 <override>AuthConfig</override>
 
 <usage>
-
-<note>$B5-:\$5$l$F$$$k>pJs$O!"L$$@(B Apache 2.0 $B8~$1$K%"%C%W%G!<%H$5$l$F$$$^$;$s!#(B
-Apache 2.0 $B$G$O!"%b%8%e!<%k$N=g=x$E$1$K0[$J$k;EAH$_$r;H$C$F$$$^$9!#(B</note>
-
-    <p><directive>AuthAuthoritative</directive>
+    <p><directive>AuthBasicAuthoritative</directive>
     $B%G%#%l%/%F%#%V$GL@<(E*$K(B <strong>'off'</strong>$B$K@_Dj$9$k$H!"(B
     $BM?$($i$l$?G'>Z%f!<%6(B ID $B$KBP$7$F(B<strong>$B%f!<%6(B ID $B$,$J$$(B</strong>
     $B$^$?$O(B<strong>$B%k!<%k$,$J$$(B</strong>$B>l9g$K!"(B
@@ -153,33 +75,11 @@ Apache 2.0 $B$G$O!"%b%8%e!<%k$N=g=x$E$1$K0[$J$k;EAH$_$r;H$C$F$$$^$9!#(B</note>
     $B0l$DL\$N%b%8%e!<%k$,G'Dj$r9T$C$F!"(BAuthAuthoritative $B@_Dj$K4X$o$i$:!"(B
     $B%"%/%;%9$O0\9T$7$^$;$s!#(B</p>
 
-    <p>$B0lHLE*$J;HMQK!$O!"(B<module>mod_auth_dbm</module>,
-    <code>mod_auth_msql</code>, <module>mod_auth_anon</module>
-    $B$H$$$C$?%G!<%?%Y!<%9%b%8%e!<%k$N0l$D$HAH$_9g$o$;$k$3$H$G$9!#(B
-    $B$3$l$i$N%b%8%e!<%k$OB?$/$N%f!<%6;q3J8!::$rDs6!$7$F$/$l$^$9!#(B
-    $B$7$+$7!">/?t$N(B ($B4IM}<T4XO"$N(B) $B%"%/%;%9$O(B
-    <directive module="mod_auth">AuthUserFile</directive>
-    $B$GNI$/J]8n$5$l$?!"$h$jDc%l%Y%k$K0\9T$9$k$h$&$K$7$^$9!#(B</p>
-
     <p>$B%G%U%)%k%H$G$O!"@)8f$O0\9T$7$^$;$s!#$=$7$F!"L$CN$N%f!<%6(B ID $B$d(B
-    $B%k!<%k$,$"$C$F$b!V(BAuthorization Required$B!W1~Ez$,JV$5$l$^$9!#(B
+    $B%k!<%k$,$"$C$F$b!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B
     $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V@_Dj$7$J$$$3$H$G%7%9%F%`$N0BA4$r0];}$G$-$F!"$^$?!"(B
     NCSA $B=`5r$N5sF0$r6/@)$G$-$^$9!#(B</p>
 
-    <note><title>$B%;%-%e%j%F%#(B</title> $B%f!<%6$,<+J,<+?H$G:n@.$7$?(B
-    .htaccess $B%U%!%$%k$GG'>Z$G$-$k$h$&$K$9$k$3$H$N1F6A$r(B
-    $B9MN8$KF~$l$F$*$$$F$/$@$5$$!#$=$7$F!"(B
-    $B$=$l$,K\Ev$K4uK>$N5sF0$G$"$k$+$I$&$+$r8!F$$7$F$/$@$5$$!#(B
-    $B0lHLE*$K8@$C$F!"(BmSQL $B$H$$$C$?%G!<%?%Y!<%9$N%;%-%e%j%F%#J]8n$h$j$b!"(B
-    $BC1=c$K0l$D$N%U%!%$%k(B .htpasswd $B$N%;%-%e%j%F%#$rJ]8n$9$kJ}$,MF0W$G$9!#(B
-    <directive module="mod_auth">AuthUserFile</directive> $B$H(B
-    <directive module="mod_auth">AuthGroupFile</directive> $B$O!"(B
-    $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k(B
-    $B$h$&$K$7$F$/$@$5$$!#J]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B
-    <em>$BCV$+$J$$$G2<$5$$(B</em>$B!#$=$&$7$J$$$H(B 
-    <directive module="mod_auth">AuthUserFile</directive> $B$H(B
-    <directive module="mod_auth">AuthGroupFile</directive>
-    $B$O%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</note>
 </usage>
 </directivesynopsis>