Commit ab1447c7 authored by Hiroaki Kawai's avatar Hiroaki Kawai
Browse files

Sync.

Submitted by: takashi
Reviewed by: kawai

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@668066 13f79535-47bb-0310-9956-ffa450edef68
parent 087695c4
Loading
Loading
Loading
Loading
+4 −4
Changes for docs/manual/mod/mod_access_compat.xml.ja: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<!-- English Revision: 522942:645883 (outdated) -->
<!-- English Revision: 645883 -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,7 +57,7 @@
    <p>ホストによるアクセス制限とパスワードによる認証を、
    同時に組み合わせて使うこともできます。
    この場合、その二つの制限の関係を指定するために
    <directive module="core">Satisfy</directive>
    <directive module="mod_access_compat">Satisfy</directive>
    ディレクティブを使用します。</p>

    <note type="warning"><title>Note</title>
@@ -285,7 +285,7 @@

      <dt><code>Mutual-failure</code></dt>

      <dd>これは <directive>Order Allow,Deny</directive> と全く同じ効果を持ち、 
      <dd>これは <code>Order Allow,Deny</code> と全く同じ効果を持ち、 
      そのため非推奨となっています。
      </dd>
    </dl>
@@ -403,7 +403,7 @@
</compatibility>

<usage>
    <p><directive module="mod_authz_host">Allow</directive> と
    <p><directive module="mod_access_compat">Allow</directive> と
    <directive module="mod_authz_core">Require</directive> の両方が使われているときの
    アクセスポリシーを設定します。パラメータは <code>All</code> か <code>Any</code>
    です。このディレクティブはある場所へのアクセスがユーザ名/パスワード
+3 −3
Changes for docs/manual/mod/mod_authn_dbm.xml.ja: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<!-- English Revision: 420990:574882 (outdated) -->
<!-- English Revision: 574882 -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,8 +43,8 @@
    で <code>dbm</code> と指定することで起動されます。</p>
</summary>

<seealso><directive module="core">AuthName</directive></seealso>
<seealso><directive module="core">AuthType</directive></seealso>
<seealso><directive module="mod_authn_core">AuthName</directive></seealso>
<seealso><directive module="mod_authn_core">AuthType</directive></seealso>
<seealso>
  <directive module="mod_auth_basic">AuthBasicProvider</directive>
</seealso>
+1 −1
Changes for docs/manual/mod/mod_info.xml.ja: 1 added line, 1 removed line.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<!-- English Revision: 151408:450473 (outdated) -->
<!-- English Revision: 450473 -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
+1 −1
Changes for docs/manual/mod/mod_log_forensic.xml.ja: 1 added line, 1 removed line.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<!-- English Revision: 420993:533344 (outdated) -->
<!-- English Revision: 533344 -->

<!--
 Licensed to the Apache Software Foundation (ASF) under one or more