Fix document typos.

Patch provided by Takuma Hoshiai.

diff --git a/doc.ja/src/sgml/client-auth.sgml b/doc.ja/src/sgml/client-auth.sgml
index 686c4e6eaaa8fe644dae73f94a3b89252ab3e513..b329060509c266e6624b92634ecc2f68769db634 100644 (file)
--- a/doc.ja/src/sgml/client-auth.sgml
+++ b/doc.ja/src/sgml/client-auth.sgml
@@ -740,12 +740,12 @@ host    postgres        all             192.168.12.10/32        md5
     <para>
 <!--
         1- Login as the database's operating system user and type
-        <command>"pg_md5 &#045;&#045;md5auth &#045;&#045;username= "</command>
+        <command>"pg_md5 &#045;&#045;md5auth &#045;&#045;username=username password"</command>
         user name and <literal>md5</literal> encrypted password are registered
         into pool_passwd.
         If pool_passwd does not exist yet, pg_md5 command will automatically create it for you.
 -->
-1. ã\83\87ã\83¼ã\82¿ã\83\99ã\83¼ã\82¹ã\81®OSã\83¦ã\83¼ã\82¶ã\81¨ã\81\97ã\81¦ã\83­ã\82°ã\82¤ã\83³ã\81\97ã\81¦ã\83³ã\81\97ã\80\81<command>"pg_md5 --md5auth --username=ã\83¦ã\83¼ã\82¶å\90\8d"</command> を実行します。
+1. ã\83\87ã\83¼ã\82¿ã\83\99ã\83¼ã\82¹ã\81®OSã\83¦ã\83¼ã\82¶ã\81¨ã\81\97ã\81¦ã\83­ã\82°ã\82¤ã\83³ã\81\97ã\80\81<command>"pg_md5 --md5auth --username=ã\83¦ã\83¼ã\82¶å\90\8d ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89"</command> を実行します。
 pool_passwdがまだ存在していなかった場合は、pg_md5コマンドが自動的にこれを生成します。
         <note>
         <para>
@@ -810,10 +810,10 @@ PAMについての詳細は<ulink url="http://www.kernel.org/pub/linux/libs/pam/
     file for <productname>Pgpool-II</productname> in the system's
     PAM configuration directory (which is usually at <literal>"/etc/pam.d"</literal>).
     A sample service-configuration file is installed as
-    <filename>"share/pgpool.pam"</filename> under the install directory.
+    <filename>"share/pgpool-II/pgpool.pam"</filename> under the install directory.
 -->
 PAM認証を有効にするには、<productname>Pgpool-II</productname>のサービス設定ファイルをシステムのPAM設定ディレクトリ（通常は<literal>"/etc/pam.d"</literal>にあります）に作成しなければなりません。
-サービス設定ファイルのサンプルはインストールディレクトリ下に<literal>"share/pgpool.pam"</literal>としてインストールされています。
+サービス設定ファイルのサンプルはインストールディレクトリ下に<literal>"share/pgpool-II/pgpool.pam"</literal>としてインストールされています。
    </para>
 
    <note>

diff --git a/doc.ja/src/sgml/installation.sgml b/doc.ja/src/sgml/installation.sgml
index 7e3cfaec07e043fc5d709af8ba1b8ba6d2d8b492..4c04a0c80c52e64bfa56acfb557b40eb3d2bc1b1 100644 (file)
--- a/doc.ja/src/sgml/installation.sgml
+++ b/doc.ja/src/sgml/installation.sgml
@@ -331,6 +331,20 @@ Windows はサポートされてません。
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term><option>--with-pam</option></term>
+       <listitem>
+          <para>
+<!--
+           <productname>Pgpool-II</productname> binaries will be built with PAM authentication support.
+          PAM authentication support is disabled by dafault.
+-->
+<productname>Pgpool-II</productname>バイナリがPAM認証サポート付で構築されます。
+デフォルトでは、PAM認証サポートは無効です。
+         </para>
+       </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>

diff --git a/doc.ja/src/sgml/ref/pg_md5.sgml b/doc.ja/src/sgml/ref/pg_md5.sgml
index 7229a6ec30c734952c56f525ee25574a8f998ce1..2c9ae6b8643ee54a5d528a693ea351155faec276 100644 (file)
--- a/doc.ja/src/sgml/ref/pg_md5.sgml
+++ b/doc.ja/src/sgml/ref/pg_md5.sgml
@@ -27,10 +27,12 @@ Pgpool-II documentation
   <cmdsynopsis>
    <command>pg_md5</command>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
+   <arg choice="plain"><replaceable>-p</replaceable></arg>
   </cmdsynopsis>
   <cmdsynopsis>
    <command>pg_md5</command>
-   <arg><replaceable>password</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+   <arg choice="plain"><replaceable>password</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc.ja/src/sgml/ref/pgpool.sgml b/doc.ja/src/sgml/ref/pgpool.sgml
index 042d73f111588e8b367ba59192910572cbb3ba4d..265b3001e56916d9b9eabeaef82a3c7a2c4e6db6 100644 (file)
--- a/doc.ja/src/sgml/ref/pgpool.sgml
+++ b/doc.ja/src/sgml/ref/pgpool.sgml
@@ -67,8 +67,10 @@ Pgpool-II documentation
   <para>
 <!--
     <command>pgpool</command> runs in 3 modes: start, stop and reload.
+    If none of stop or reload is given, it is assumed that "start" is specified.
 -->
     <command>pgpool</command>は3つのモードで実行されます。すなわち、start、stop、reloadです。
+    stopもしくはreloadが指定されていなければ、start モードが指定されているものとします。
   </para>
  </refsect1>
 

diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index fc9bb5c78a186bb8f46014ed0d46bf63ad734e4d..7fe6f79788448a71aa9636ebdc26f0b2c1eb7416 100644 (file)
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -536,7 +536,7 @@
        </para>
        <para>
          1- Login as the database's operating system user and type
-         <command>"pg_md5 --md5auth --username= "</command> user name
+         <command>"pg_md5 --md5auth --username=username password"</command> user name
          and <literal>md5</literal> encrypted password are registered
          into pool_passwd.  If pool_passwd does not exist yet, pg_md5
          command will automatically create it for you.
@@ -585,7 +585,7 @@
        file for <productname>Pgpool-II</productname> in the system's
        PAM configuration directory (which is usually at <literal>"/etc/pam.d"</literal>).
        A sample service-configuration file is installed as
-       <filename>"share/pgpool.pam"</filename> under the install directory.
+       <filename>"share/pgpool-II/pgpool.pam"</filename> under the install directory.
       </para>
 
       <note>

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 2166f22a43b51e4f64d38a63465eda005f75fafd..ecf952abbb954f1bcaf9e0636b0fcc30883922fc 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -231,6 +231,16 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>--with-pam</option></term>
+        <listitem>
+          <para>
+            <productname>Pgpool-II</productname> binaries will be built with PAM authentication support.
+          PAM authentication support is disabled by dafault.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>

diff --git a/doc/src/sgml/ref/pg_md5.sgml b/doc/src/sgml/ref/pg_md5.sgml
index e210959747602f4857b7b1f1936e224e66614e1b..e3cf324c73f842c3540693642ac071207ac15d20 100644 (file)
--- a/doc/src/sgml/ref/pg_md5.sgml
+++ b/doc/src/sgml/ref/pg_md5.sgml
@@ -24,10 +24,12 @@ Pgpool-II documentation
   <cmdsynopsis>
    <command>pg_md5</command>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
+   <arg choice="plain"><replaceable>-p</replaceable></arg>
   </cmdsynopsis>
   <cmdsynopsis>
    <command>pg_md5</command>
-   <arg><replaceable>password</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+   <arg choice="plain"><replaceable>password</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pgpool.sgml b/doc/src/sgml/ref/pgpool.sgml
index 8b38aa7f97522e1433eff6de361cd193c4ccbf46..126c146f880a9f43bc7cff94ca591d7225438390 100644 (file)
--- a/doc/src/sgml/ref/pgpool.sgml
+++ b/doc/src/sgml/ref/pgpool.sgml
@@ -50,6 +50,7 @@ Pgpool-II documentation
   <title>Usages</title>
   <para>
     <command>pgpool</command> runs in 3 modes: start, stop and reload.
+    If none of stop or reload is given, it is assumed that "start" is specified.
   </para>
  </refsect1>