diff --git a/doc.ja/src/sgml/advanced.sgml b/doc.ja/src/sgml/advanced.sgml
index 534a5dda..bb491a18 100644
--- a/doc.ja/src/sgml/advanced.sgml
+++ b/doc.ja/src/sgml/advanced.sgml
@@ -658,7 +658,7 @@
     </para>
     <para>
      <!--
-     The result packet returnd by watchdog for the "GET NODES LIST"
+     The result packet returned by watchdog for the "GET NODES LIST"
      will contains the list of all configured watchdog nodes to do
      health check on in the <acronym>JSON</acronym> format.
      The <acronym>JSON</acronym> of the watchdog nodes contains the
@@ -778,7 +778,7 @@
     status and brings the virtual IP assigned to watchdog down.
     Thus clients of <productname>Pgpool-II</productname> cannot
     connect to <productname>Pgpool-II</productname> using the
-    virtual IP any more. This is neccessary to avoid split-brain,
+    virtual IP any more. This is necessary to avoid split-brain,
     that is, situations where there are multiple active
     <productname>Pgpool-II</productname>.
     -->
@@ -851,7 +851,7 @@
 
  <sect1 id="tutorial-advanced-arch">
   <!--
-  <title>Architecure of the watchdog</title>
+  <title>Architecture of the watchdog</title>
   -->
   <title>watchdogの構造</title>
 
diff --git a/doc.ja/src/sgml/ref/show_pool_nodes.sgml b/doc.ja/src/sgml/ref/show_pool_nodes.sgml
index 94d7aadc..5a2abf79 100644
--- a/doc.ja/src/sgml/ref/show_pool_nodes.sgml
+++ b/doc.ja/src/sgml/ref/show_pool_nodes.sgml
@@ -42,7 +42,7 @@
    hostname, the port, the status, the weight (only meaningful if
    you use the load balancing mode), the role, the SELECT query
    counts issued to each backend, whether each node is the load
-   bakance node or not, the replication delay (only if in streaming
+   balance node or not, the replication delay (only if in streaming
    replication mode) and last status change time. The possible
    values in the status column are explained in
    the <xref linkend="pcp-node-info"> reference. If the hostname is
diff --git a/doc.ja/src/sgml/release-3.3.sgml b/doc.ja/src/sgml/release-3.3.sgml
index 59c51e1f..9606c837 100644
--- a/doc.ja/src/sgml/release-3.3.sgml
+++ b/doc.ja/src/sgml/release-3.3.sgml
@@ -185,7 +185,7 @@
     </para>
     <para>
      <!--
-     Removeing "Type=forking" and add OPTS=" -n" to
+     Removing "Type=forking" and add OPTS=" -n" to
      run Pgpool-II with non-daemon mode, because we need to redirect logs.
      Using "journalctl" command to see Pgpool-II systemd log.
      -->
diff --git a/doc.ja/src/sgml/release-3.4.sgml b/doc.ja/src/sgml/release-3.4.sgml
index 5a08e3f3..ff3baa26 100644
--- a/doc.ja/src/sgml/release-3.4.sgml
+++ b/doc.ja/src/sgml/release-3.4.sgml
@@ -349,7 +349,7 @@
     </para>
     <para>
      <!--
-     When all backend nodes are down, <productname>Pgpool-II</> throws an uncorrect
+     When all backend nodes are down, <productname>Pgpool-II</> throws an incorrect
      error message "ERROR: connection cache is full". Change the error
      message to "all backend nodes are down, pgpool requires at least one valid node".
      -->
@@ -929,7 +929,7 @@
     <para>
      <!--
      In a explicit transaction, the <literal>SELECT</literal> results are cached in temporary buffer.
-     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffe should be reset.
+     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffer should be reset.
      -->
      明示的なトランザクションでは、<literal>SELECT</literal>の結果は一時バッファにキャッシュされます。
      テーブルを変更する書込み<acronym>SQL</acronym>が送信されると、一時的なバッファをリセットしなければなりません。
@@ -1403,7 +1403,7 @@
     </para>
     <para>
      <!--
-     Removeing "Type=forking" and add OPTS=" -n" to
+     Removing "Type=forking" and add OPTS=" -n" to
      run Pgpool-II with non-daemon mode, because we need to redirect logs.
      Using "journalctl" command to see Pgpool-II systemd log.
      -->
diff --git a/doc.ja/src/sgml/release-3.5.sgml b/doc.ja/src/sgml/release-3.5.sgml
index e2640a9d..77b6a364 100644
--- a/doc.ja/src/sgml/release-3.5.sgml
+++ b/doc.ja/src/sgml/release-3.5.sgml
@@ -448,7 +448,7 @@
     -->
     <para>
      <!--
-     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failire. (Bo Peng)
+     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failure. (Bo Peng)
      -->
      起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、
      PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng)
@@ -795,7 +795,7 @@
     -->
     <para>
      <!--
-     Fix sefault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
+     Fix segfault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
      -->
      クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
     </para>
@@ -962,7 +962,7 @@
     </para>
     <para>
      <!--
-     When all backend nodes are down, <productname>Pgpool-II</> throws an uncorrect
+     When all backend nodes are down, <productname>Pgpool-II</> throws an incorrect
      error message "ERROR: connection cache is full". Change the error
      message to "all backend nodes are down, pgpool requires at least one valid node".
      -->
@@ -1663,7 +1663,7 @@
     <para>
      <!--
      In a explicit transaction, the <literal>SELECT</literal> results are cached in temporary buffer.
-     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffe should be reset.
+     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffer should be reset.
      -->
      明示的なトランザクションでは、<literal>SELECT</literal>の結果は一時バッファにキャッシュされます。
      テーブルを変更する書込み<acronym>SQL</acronym>が送信されると、一時的なバッファをリセットしなければなりません。
@@ -2276,7 +2276,7 @@
     </para>
     <para>
      <!--
-     Removeing "Type=forking" and add OPTS=" -n" to
+     Removing "Type=forking" and add OPTS=" -n" to
      run Pgpool-II with non-daemon mode, because we need to redirect logs.
      Using "journalctl" command to see Pgpool-II systemd log.
      -->
@@ -2473,7 +2473,7 @@
      <!--
      But the problem with this technique is that, for the instance when the node has
      announced itself as a master/coordinator of the cluster and is waiting for
-     the standby nodes to recognise it as a Master node. For that period of time
+     the standby nodes to recognize it as a Master node. For that period of time
      the watchdog state of the node is Master/coordinator, but it is yet not fully
      capable of handling the failover and failover-locking requests.
      -->
@@ -2947,7 +2947,7 @@
      <productname>Pgpool-II</productname>が "Row description" メッセージを受信した際に、クエリ処理中のフラグをリセットするように修正しました。"no data" メッセージと同じ扱いにする必要がありました。
     </para>
     <para>
-     詳細は<ulink url="http://www.pgpool.net/pipermail/pgpool-general/2017-June/005613.html">[pgpo       ol-general: 5555]</ulink>を参照してください。
+     詳細は<ulink url="http://www.pgpool.net/pipermail/pgpool-general/2017-June/005613.html">[pgpool-general: 5555]</ulink>を参照してください。
     </para>
    </listitem>
 
@@ -3158,7 +3158,7 @@
     2017-04-06 [7859f06]
     -->
     <para>
-     リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsu Ishii)
+     リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsuo Ishii)
     </para>
    </listitem>
 
diff --git a/doc.ja/src/sgml/release-3.6.sgml b/doc.ja/src/sgml/release-3.6.sgml
index c485ddd8..fbd3c6f9 100644
--- a/doc.ja/src/sgml/release-3.6.sgml
+++ b/doc.ja/src/sgml/release-3.6.sgml
@@ -20,7 +20,7 @@
     </para>
     <para>
      サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。
-     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。
+     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。
      PostgreSQLのCVE-2021-23214と似た脆弱性です。
     </para>
     <para>
@@ -1116,7 +1116,7 @@
     -->
     <para>
      <!--
-     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failire. (Bo Peng)
+     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failure. (Bo Peng)
      -->
      起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、
      PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng)
@@ -1563,7 +1563,7 @@
     -->
     <para>
      <!--
-     Fix sefault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
+     Fix segfault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
      -->
      クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
     </para>
@@ -1784,7 +1784,7 @@
     </para>
     <para>
      <!--
-     When all backend nodes are down, <productname>Pgpool-II</> throws an uncorrect
+     When all backend nodes are down, <productname>Pgpool-II</> throws an incorrect
      error message "ERROR: connection cache is full". Change the error
      message to "all backend nodes are down, pgpool requires at least one valid node".
      -->
@@ -2622,7 +2622,7 @@
     <para>
      <!--
      In a explicit transaction, the <literal>SELECT</literal> results are cached in temporary buffer.
-     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffe should be reset.
+     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffer should be reset.
      -->
      明示的なトランザクションでは、<literal>SELECT</literal>の結果は一時バッファにキャッシュされます。
      テーブルを変更する書込み<acronym>SQL</acronym>が送信されると、一時的なバッファをリセットしなければなりません。
@@ -3447,7 +3447,7 @@
     </para>
     <para>
      <!--
-     Removeing "Type=forking" and add OPTS=" -n" to
+     Removing "Type=forking" and add OPTS=" -n" to
      run Pgpool-II with non-daemon mode, because we need to redirect logs.
      Using "journalctl" command to see Pgpool-II systemd log.
      -->
@@ -3703,7 +3703,7 @@
      <!--
      But the problem with this technique is that, for the instance when the node has
      announced itself as a master/coordinator of the cluster and is waiting for
-     the standby nodes to recognise it as a Master node. For that period of time
+     the standby nodes to recognize it as a Master node. For that period of time
      the watchdog state of the node is Master/coordinator, but it is yet not fully
      capable of handling the failover and failover-locking requests.
      -->
@@ -4444,7 +4444,7 @@
     2017-04-14 [50fb9a4]
     -->
     <para>
-     pool_config_vatiable.cから「定義されたが未使用の関数」という警告を削除しました。(Muhammad Usama)
+     pool_config_variable.cから「定義されたが未使用の関数」という警告を削除しました。(Muhammad Usama)
     </para>
    </listitem>
 
@@ -4556,7 +4556,7 @@
     2017-04-06 [d87f93d]
     -->
     <para>
-     リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsu Ishii)
+     リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsuo Ishii)
     </para>
    </listitem>
 
@@ -5487,7 +5487,7 @@
     -->
     <para>
      <!--
-     Sync inconsitent status
+     Sync inconsistent status
      of <productname>PostgreSQL</productname> nodes
      in <productname>Pgpool-II</productname> instances after
      restart. (Muhammad Usama)
@@ -5759,7 +5759,7 @@
     </para>
     <para>
      <!--
-     This commit tries to remove the data inconsitency in
+     This commit tries to remove the data inconsistency in
      replication mode found
      in <ulink url="http://www.pgpool.net/pipermail/pgpool-general/2015-August/003974.html">[pgpool-general:
      3918]</ulink> by not recording the status file when all
@@ -6254,11 +6254,11 @@
    </listitem>
    <listitem>
     <!--
-    2016-08-01 [024eaea]  Fix for 215: pgpool doesnt escalate ip in case of another node inavailability
+    2016-08-01 [024eaea]  Fix for 215: pgpool doesn't escalate ip in case of another node unavailability
     -->
     <para>
      <!--
-     Fix <productname>Pgpool-II</productname> doesn't escalate ip in case of another node inavailability. (bug 215) (Muhammad Usama)
+     Fix <productname>Pgpool-II</productname> doesn't escalate ip in case of another node unavailability. (bug 215) (Muhammad Usama)
      -->
      他のノードが利用できない場合、<productname>Pgpool-II</productname> が
      IPアドレスをエスカレートしない不具合を修正しました。(bug 215) (Muhammad Usama)
@@ -6534,20 +6534,20 @@
    </listitem>
    <listitem>
     <!--
-    2016-06-08 [294cf4a]  Fix a posible hang during health checking
+    2016-06-08 [294cf4a]  Fix a possible hang during health checking
     -->
     <para>
      <!--
-     Fix a posible hang during health checking. (bug 204) (Yugo Nagata)
+     Fix a possible hang during health checking. (bug 204) (Yugo Nagata)
      -->
      ヘルスチェックで発生し得るハングアップを修正しました。(bug 204) (Yugo Nagata)
     </para>
     <para>
      <!--
-     Helath checking was hang when any data wasn't sent
+     Health checking was hang when any data wasn't sent
      from backend after <function>connect(2)</function> succeeded. To fix this,
      <function>pool_check_fd()</function> returns 1 when <function>select(2)</function> exits with
-     EINTR due to SIGALRM while health checkking is performed.
+     EINTR due to SIGALRM while health checking is performed.
      -->
      <function>connect(2)</function> が成功し、
      その後バックエンドからデータが送信されない場合、ヘルスチェックがハングしていました。
@@ -6668,17 +6668,17 @@
    </listitem>
    <listitem>
     <!--
-    2016-05-11 [de905f6]  Fix documetation bug about raw mode
+    2016-05-11 [de905f6]  Fix documentation bug about raw mode
     -->
     <para>
      <!--
-     Fix  Japanese and Chinese documetation bug about raw mode. (Yugo Nagata, Bo Peng)
+     Fix  Japanese and Chinese documentation bug about raw mode. (Yugo Nagata, Bo Peng)
      -->
      日本語と中国語ドキュメントのraw モードに関する内容の誤りを修正しました。(Yugo Nagata, Bo Peng)
     </para>
     <para>
      <!--
-     Connection pool is avalilable in raw mode.
+     Connection pool is available in raw mode.
      -->
      raw モードでも、コネクションプーリングが有効です。
     </para>
@@ -6856,7 +6856,7 @@
     </para>
     <para>
      <!--
-     This could happend if we execute an extended protocol query and it fails.
+     This could happened if we execute an extended protocol query and it fails.
      -->
      これは拡張プロトコル問い合わせを実行しそれが失敗したときに発生し得ました。
     </para>
diff --git a/doc.ja/src/sgml/release-3.7.sgml b/doc.ja/src/sgml/release-3.7.sgml
index eb8982b9..f4f7d197 100644
--- a/doc.ja/src/sgml/release-3.7.sgml
+++ b/doc.ja/src/sgml/release-3.7.sgml
@@ -667,7 +667,7 @@
     </para>
     <para>
      サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。
-     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。
+     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。
      PostgreSQLのCVE-2021-23214と似た脆弱性です。
     </para>
     <para>
@@ -1942,7 +1942,7 @@
     -->
     <para>
      <!--
-     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failire. (Bo Peng)
+     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failure. (Bo Peng)
      -->
      起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、
      PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng)
@@ -2265,7 +2265,7 @@
     -->
     <para>
      <!--
-     Doc: mention that VIP will not be brougt up if quorum does not exist. (Tatsuo Ishii)
+     Doc: mention that VIP will not be brought up if quorum does not exist. (Tatsuo Ishii)
      -->
 	 Doc: クォーラムが存在しない場合、VIPは起動されないことをドキュメントに追加しました。(Tatsuo Ishii)
     </para>
@@ -2549,7 +2549,7 @@
     -->
     <para>
      <!--
-     Fix sefault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
+     Fix segfault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
      -->
      クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
     </para>
@@ -2782,7 +2782,7 @@
     </para>
     <para>
      <!--
-     When all backend nodes are down, <productname>Pgpool-II</> throws an uncorrect
+     When all backend nodes are down, <productname>Pgpool-II</> throws an incorrect
      error message "ERROR: connection cache is full". Change the error
      message to "all backend nodes are down, pgpool requires at least one valid node".
      -->
@@ -3658,7 +3658,7 @@
     <para>
      <!--
      In a explicit transaction, the <literal>SELECT</literal> results are cached in temporary buffer.
-     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffe should be reset.
+     If a write <acronym>SQL</acronym> is sent which modifies the table, the temporary buffer should be reset.
      -->
      明示的なトランザクションでは、<literal>SELECT</literal>の結果は一時バッファにキャッシュされます。
      テーブルを変更する書込み<acronym>SQL</acronym>が送信されると、一時的なバッファをリセットしなければなりません。
@@ -4791,7 +4791,7 @@
     </para>
     <para>
      <!--
-     Removeing "Type=forking" and add OPTS=" -n" to
+     Removing "Type=forking" and add OPTS=" -n" to
      run Pgpool-II with non-daemon mode, because we need to redirect logs.
      Using "journalctl" command to see Pgpool-II systemd log.
      -->
@@ -5264,7 +5264,7 @@
      Supporting per node health check parameters. (Tatsuo Ishii,
      Muhammad Usama)
      -->
-     <productname>PostgreSQL</productname>ノードごとにヘルスチェックパラメータを設定できるようになりました。(Tatsuo Ishi, Muhammad Usama)
+     <productname>PostgreSQL</productname>ノードごとにヘルスチェックパラメータを設定できるようになりました。(Tatsuo Ishii, Muhammad Usama)
     </para>
     <para>
      <!--
diff --git a/doc.ja/src/sgml/release-4.0.sgml b/doc.ja/src/sgml/release-4.0.sgml
index f97b7367..92e81a83 100644
--- a/doc.ja/src/sgml/release-4.0.sgml
+++ b/doc.ja/src/sgml/release-4.0.sgml
@@ -1357,7 +1357,7 @@
     </para>
     <para>
      サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。
-     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。
+     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。
      PostgreSQLのCVE-2021-23214と似た脆弱性です。
     </para>
     <para>
@@ -2762,7 +2762,7 @@
     -->
     <para>
      <!--
-     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failire. (Bo Peng)
+     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failure. (Bo Peng)
      -->
      起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、
      PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng)
@@ -2838,7 +2838,7 @@
     -->
     <para>
      <!--
-     Doc: Change the sample follow_master_command script %M %H paramater's order. (Bo Peng)
+     Doc: Change the sample follow_master_command script %M %H parameter's order. (Bo Peng)
      -->
      Doc: follow_master_command サンプルスクリプトの %M と %H パラメータの順序を変更しました。(Bo Peng)
     </para>
@@ -3120,7 +3120,7 @@
     -->
     <para>
      <!--
-     Doc: mention that VIP will not be brougt up if quorum does not exist. (Tatsuo Ishii)
+     Doc: mention that VIP will not be brought up if quorum does not exist. (Tatsuo Ishii)
      -->
 	 Doc: クォーラムが存在しない場合、VIPは起動されないことをドキュメントに追加しました。(Tatsuo Ishii)
     </para>
@@ -3471,7 +3471,7 @@
     -->
     <para>
      <!--
-     Fix sefault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
+     Fix segfault when query cache is enabled. (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
      -->
      クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(<ulink url="https://www.pgpool.net/mantisbt/view.php?id=525">bug 525</ulink>) (Tatsuo Ishii)
     </para>
@@ -3704,7 +3704,7 @@
     </para>
     <para>
      <!--
-     When all backend nodes are down, <productname>Pgpool-II</> throws an uncorrect
+     When all backend nodes are down, <productname>Pgpool-II</> throws an incorrect
      error message "ERROR: connection cache is full". Change the error
      message to "all backend nodes are down, pgpool requires at least one valid node".
      -->
@@ -4609,7 +4609,7 @@
   <title>概要</title>
   <para>
    <!--
-   This version addes support for SCRAM and CERT authentication,
+   This version adds support for SCRAM and CERT authentication,
    improves load balancing control and import PostgreSQL 11
    new SQL parser.
    -->
@@ -5090,7 +5090,7 @@
      <!--
      Specify a semicolon separated list of SQL patterns that
      should be sent to primary node only. Regular expression can be
-     used in SQL patterns. Only Maste Slave mode is supported.
+     used in SQL patterns. Only Master Slave mode is supported.
      -->
      プライマリノードだけに送るSQLのパターンをセミコロンで区切られたリストで指定できます。
      SQLのパターンには正規表現を使用することができます。
@@ -5328,7 +5328,7 @@
      <!--
      Downgrade most of DEBUG1 messages to DEBUG5. (Tatsuo Ishii)
      -->
-     大半のDBUG1のメッセージをDEBUG5に変更しました。(Tatsuo Ishii)
+     大半のDEBUG1のメッセージをDEBUG5に変更しました。(Tatsuo Ishii)
     </para>
     <para>
      <!--
@@ -5411,7 +5411,7 @@
      <!--
      pgpool_setup -n 3 (or greater) triggers the bug. While recovering node
      2, pgpool main process tried to retrieve version info from backend #2
-     even if it's not running. This causes the sefault because connection
+     even if it's not running. This causes the segfault because connection
      was not established yet. The reason why <productname>PostgreSQL 9.6</productname>
      or later was not suffered from the bug was, <productname>PostgreSQL</productname>
      exited the loop as soon as the server version is higher than 9.5. To fix this,
diff --git a/doc.ja/src/sgml/release-4.1.sgml b/doc.ja/src/sgml/release-4.1.sgml
index 33292e8e..28d74ed2 100644
--- a/doc.ja/src/sgml/release-4.1.sgml
+++ b/doc.ja/src/sgml/release-4.1.sgml
@@ -335,7 +335,7 @@
      このポータルは<productname>Pgpool-II</productname>によって管理されないため、<command>Describe foo</command>メッセージは「unable to execute Describe. unable to get the bind message」エラーで失敗していました。
     </para>
     <para>
-     これを修正するため、<function>Describe()</function>でダミーの書き込みクエリコンテキストを作成し、<command>Desribe</command>メッセージをプライマリ（ストリーミングレプリケーションモード）またはすべてのノード（レプリケーション/スナップショットアイソレーションモード）に送信するようにしました。
+     これを修正するため、<function>Describe()</function>でダミーの書き込みクエリコンテキストを作成し、<command>Describe</command>メッセージをプライマリ（ストリーミングレプリケーションモード）またはすべてのノード（レプリケーション/スナップショットアイソレーションモード）に送信するようにしました。
     </para>
     <para>
      新たなテストケース080も追加しました。
@@ -1416,7 +1416,7 @@
         <!--
         Fix process memory requirement. Previously the formula was based on
         RSS. However PSS should be used because RSS includes shared memory
-        such as the memory used for libraries. This resuls in lot smaller
+        such as the memory used for libraries. This results in lot smaller
         memory requirement than before.
         -->
         必要プロセスメモリを修正しました。以前の式はRSSを基にしていましたが、RSSはライブラリに使用されるメモリなどの共有メモリも含むため、PSSを使用するべきです。
@@ -2040,7 +2040,7 @@
     </para>
     <para>
      サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。
-     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。
+     これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。
      PostgreSQLのCVE-2021-23214と似た脆弱性です。
     </para>
     <para>
@@ -3769,7 +3769,7 @@
     -->
     <para>
      <!--
-     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failire. (Bo Peng)
+     Check if socket file exists at startup and remove them if PID file doesn't exist to avoid bind() failure. (Bo Peng)
      -->
      起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、
      PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng)
@@ -3874,7 +3874,7 @@
     -->
     <para>
      <!--
-     Doc: Change the sample follow_master_command script %M %H paramater's order. (Bo Peng)
+     Doc: Change the sample follow_master_command script %M %H parameter's order. (Bo Peng)
      -->
      Doc: follow_master_command サンプルスクリプトの%Mと%Hパラメータの順序を変更しました。(Bo Peng)
     </para>
@@ -4133,7 +4133,7 @@
     2019-08-29 [69419ac4]
     -->
     <para>
-     多数決ルールを設定する<xref linkend="guc-enable-consensus-with-half-votes">パラメータを追加しました。 (Muhammd Usama, Tatsuo Ishii)
+     多数決ルールを設定する<xref linkend="guc-enable-consensus-with-half-votes">パラメータを追加しました。 (Muhammad Usama, Tatsuo Ishii)
     </para>
     <para>
      これは、偶数（すなわち、2, 4, 6...) watchdogクラスタにおけるクォーラムの存在および多数決の決定における振る舞いを変更します。
@@ -4169,7 +4169,7 @@
     </para>
     <para>
 <!--
-     If installing from RPMs, <literal>postrges</literal> user will be allowed to
+     If installing from RPMs, <literal>postgres</literal> user will be allowed to
      run <varname>if_up/down_cmd</varname> and <varname>arping_cmd</varname>
      with sudo without a password.
      If <varname>if_up/down_cmd</varname> or <varname>arping_cmd</varname> starts with "/",
@@ -4387,9 +4387,9 @@
     <para>
 <!--
      Performance enhancements for the large INSERT and UPDATE
-     statements. (Muhammd Usama)
+     statements. (Muhammad Usama)
 -->
-     大規模なINSERTとUPDATE文のパフォーマンスの強化。(Muhammd Usama)
+     大規模なINSERTとUPDATE文のパフォーマンスの強化。(Muhammad Usama)
     </para>
     <para>
 <!--
@@ -4449,7 +4449,7 @@
     </para>
     <para>
 <!--
-     Major chanegs of PostgreSQL 12 parser include:
+     Major changes of PostgreSQL 12 parser include:
 -->
      PostgreSQL12のパーサの主な改善点は以下のとおりです。
 
@@ -4849,9 +4849,9 @@
     <para>
 <!--
      Resign the master watchdog node from master responsibilities if
-     the primary backend node gets into quarantine state on that. (Muhammd Usama)
+     the primary backend node gets into quarantine state on that. (Muhammad Usama)
 -->
-     プライマリバックエンドノードがqurantine状態になるのであれば、マスタwatchdogノードを辞退します。(Muhammd Usama)
+     プライマリバックエンドノードがquarantine状態になるのであれば、マスタwatchdogノードを辞退します。(Muhammad Usama)
     </para>
     <para>
 <!--
@@ -4891,7 +4891,7 @@
     2019-08-29 [69419ac4]
     -->
     <para>
-     多数決ルールの計算方法を設定する<xref linkend="guc-enable-consensus-with-half-votes">パラメータを追加しました。(Muhammd Usama, Tatsuo Ishii)
+     多数決ルールの計算方法を設定する<xref linkend="guc-enable-consensus-with-half-votes">パラメータを追加しました。(Muhammad Usama, Tatsuo Ishii)
     </para>
     <para>
      <productname>Pgpool-II</productname>はwatchdogクラスタが偶数のノードで構成されている場合、ちょうど50%の賛成を得られたときにクォーラムの存在とフェイルオーバの合意を決定します。
@@ -5008,7 +5008,7 @@
        <para>
 <!--
 	Mention that schema qualifications cannot be used in
-	Add performance chapterwhite/black_function_list. (tatsuo
+	Add performance chapter white/black_function_list. (tatsuo
 	Ishii)
 -->
         white/black_function_listでスキーマ修飾が使用出来ないことを記述しました。(tatsuo Ishii)
@@ -5102,7 +5102,7 @@
 	Add description to pg_md5 man page how to show
 	pool_passwd ready string. (tatsuo ishii)
 -->
-        pg_md5のマニュアルページにpool_paswd文字列の表現の仕方の説明を追加しました。(tatsuo ishii)
+        pg_md5のマニュアルページにpool_passwd文字列の表現の仕方の説明を追加しました。(tatsuo ishii)
        </para>
       </listitem>
 
diff --git a/doc.ja/src/sgml/runtime.sgml b/doc.ja/src/sgml/runtime.sgml
index a1f44a81..c17833ed 100644
--- a/doc.ja/src/sgml/runtime.sgml
+++ b/doc.ja/src/sgml/runtime.sgml
@@ -339,7 +339,7 @@
     responsible for synchronizing tables. Load balancing is possible
     in the mode. Since logical replication does not replicate all
     tables, it's user's responsibility to replicate the table which
-    could be load balanced. <productname>Pgpool-II</> load balaces
+    could be load balanced. <productname>Pgpool-II</> load balances
     all tables. This means that if a table is not
     replicated, <productname>Pgpool-II</> may lookup outdated tables
     in the subscriber side.
@@ -423,7 +423,7 @@
     <!--
     In the raw mode, <productname>Pgpool-II</> does not care about the database
     synchronization. It's user's responsibility to make the whole
-    system does a meaningfull thing. Load balancing
+    system does a meaningful thing. Load balancing
     is <emphasis>not</emphasis> possible in the mode.
     -->
     <firstterm>rawモード</firstterm>では、<productname>Pgpool-II</>はデータベースの同期に関しては関与しません。
@@ -445,7 +445,7 @@
    backend servers, you need to configure <varname>backend*</varname>
    in <filename>pgpool.conf</filename>.  For starters, at
    least <xref linkend="guc-backend-hostname">
-   and <xref linkend="guc-backend-port"> paramters are required to
+   and <xref linkend="guc-backend-port"> parameters are required to
    be set up to start <productname>Pgpool-II</> server.
    -->
    <productname>Pgpool-II</>が<productname>PostgreSQL</>バックエンドサーバを認識するために、<filename>pgpool.conf</filename>の<varname>backend*</varname>を設定する必要があります。
diff --git a/doc/src/sgml/ref/show_pool_cache.sgml b/doc/src/sgml/ref/show_pool_cache.sgml
index 16788430..fb104df1 100644
--- a/doc/src/sgml/ref/show_pool_cache.sgml
+++ b/doc/src/sgml/ref/show_pool_cache.sgml
@@ -129,7 +129,7 @@
      <row>
       <entry><literal>free_cache_entries_size</literal></entry>
       <entry>
-       The size in bytes of the unsed cache.  As this value approaches
+       The size in bytes of the unused cache.  As this value approaches
        0, it removes the registered cache and registers a new cache,
        which does not cause an error, but reduces performance.
        Consider to increase <xref linkend="guc-memqcache-total-size">.
diff --git a/doc/src/sgml/release-3.6.sgml b/doc/src/sgml/release-3.6.sgml
index 027c7cbe..fee93215 100644
--- a/doc/src/sgml/release-3.6.sgml
+++ b/doc/src/sgml/release-3.6.sgml
@@ -98,7 +98,7 @@
      Fix the incorrect display of load balancing node in raw mode. (Bo Peng)
     </para>
     <para>
-     In raw mode, <productname>Pgpool-II</productname> sends all queies to main node.
+     In raw mode, <productname>Pgpool-II</productname> sends all queries to main node.
      This is harmless, but it may confuse users.
     </para>
    </listitem>
@@ -3258,7 +3258,7 @@
     <programlisting>
      - pgpool.conf is configured so that all read queries are sent to the standby.
      - First, issue a writing query in a transaction block
-     - After commiting the transaction, issue a select query.
+     - After committing the transaction, issue a select query.
      - When processing the query, send Describe (statement) message just after Parse.
     </programlisting>
 
@@ -5040,7 +5040,7 @@
    </listitem>
    <listitem>
     <!--
-    2016-08-01 [024eaea]  Fix for 215: pgpool doesnt escalate ip in case of another node unavailability
+    2016-08-01 [024eaea]  Fix for 215: pgpool doesn't escalate ip in case of another node unavailability
     -->
     <para>
      Fix <productname>Pgpool-II</productname> doesn't escalate ip in case of another node unavailability. (bug 215) (Muhammad Usama)
diff --git a/doc/src/sgml/release-3.7.sgml b/doc/src/sgml/release-3.7.sgml
index 179dda7d..7ff554d9 100644
--- a/doc/src/sgml/release-3.7.sgml
+++ b/doc/src/sgml/release-3.7.sgml
@@ -752,7 +752,7 @@
      Fix the incorrect display of load balancing node in raw mode. (Bo Peng)
     </para>
     <para>
-     In raw mode, <productname>Pgpool-II</productname> sends all queies to main node.
+     In raw mode, <productname>Pgpool-II</productname> sends all queries to main node.
      This is harmless, but it may confuse users.
     </para>
    </listitem>
diff --git a/doc/src/sgml/release-4.0.sgml b/doc/src/sgml/release-4.0.sgml
index 28373089..23258c7e 100644
--- a/doc/src/sgml/release-4.0.sgml
+++ b/doc/src/sgml/release-4.0.sgml
@@ -223,11 +223,11 @@
     2023-01-31 [633bdca]
     -->
     <para>
-     Fix kind mimatch error with <literal>DEALLOCATE</literal>.
+     Fix kind mismatch error with <literal>DEALLOCATE</literal>.
      (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=780">bug 780</ulink>) (Tatsuo Ishii)
     </para>
     <para>
-     Kind mimatch error occurs when conditions below are all met:
+     Kind mismatch error occurs when conditions below are all met:
      <itemizedlist>
       <listitem>
        <para>
@@ -652,7 +652,7 @@
     <para>
      To deal with idle_session_timeout detect_idle_session_timeout_error()
      is added to detect the error code for idle_session_timeout. If the
-     error is detected, Pgpool-II returns the error code to frondend as a
+     error is detected, Pgpool-II returns the error code to frontend as a
      fatal error and disconnects the session.  This is a similar fix
      implemented for idle_in_transaction_session_timeout.
      <ulink url="https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commit;h=3f5986eee360f12e6a0bb77aa46f95abf5f6bc10">3f5986eee360f12e6a0bb77aa46f95abf5f6bc10</ulink>
@@ -1092,7 +1092,7 @@
     2022-04-17 [72d31b0]
     -->
     <para>
-     Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii)
+     Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii)
     </para>
    </listitem>
 
@@ -1494,7 +1494,7 @@
      Fix the incorrect display of load balancing node in raw mode. (Bo Peng)
     </para>
     <para>
-     In raw mode, <productname>Pgpool-II</productname> sends all queies to main node.
+     In raw mode, <productname>Pgpool-II</productname> sends all queries to main node.
      This is harmless, but it may confuse users.
     </para>
    </listitem>
@@ -1520,7 +1520,7 @@
     2021-10-06 [42a77d8c]
     -->
     <para>
-     Doc: fix documentaion typos. (Bo Peng)
+     Doc: fix documentation typos. (Bo Peng)
     </para>
    </listitem>
 
diff --git a/doc/src/sgml/release-4.1.sgml b/doc/src/sgml/release-4.1.sgml
index 3ae851ff..d3f9fed7 100644
--- a/doc/src/sgml/release-4.1.sgml
+++ b/doc/src/sgml/release-4.1.sgml
@@ -460,7 +460,7 @@
     2023-08-09 [30db44e]
     -->
     <para>
-     Fix covery warning. (Tatsuo Ishii)
+     Fix coverity warning. (Tatsuo Ishii)
     </para>
     <para>
      Fix query cache module assigned time_t value to int32 variable. Change
@@ -796,11 +796,11 @@
     2023-01-31 [633bdca]
     -->
     <para>
-     Fix kind mimatch error with <literal>DEALLOCATE</literal>.
+     Fix kind mismatch error with <literal>DEALLOCATE</literal>.
      (<ulink url="https://www.pgpool.net/mantisbt/view.php?id=780">bug 780</ulink>) (Tatsuo Ishii)
     </para>
     <para>
-     Kind mimatch error occurs when conditions below are all met:
+     Kind mismatch error occurs when conditions below are all met:
      <itemizedlist>
       <listitem>
        <para>
@@ -1225,7 +1225,7 @@
     <para>
      To deal with idle_session_timeout detect_idle_session_timeout_error()
      is added to detect the error code for idle_session_timeout. If the
-     error is detected, Pgpool-II returns the error code to frondend as a
+     error is detected, Pgpool-II returns the error code to frontend as a
      fatal error and disconnects the session.  This is a similar fix
      implemented for idle_in_transaction_session_timeout.
      <ulink url="https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commit;h=3f5986eee360f12e6a0bb77aa46f95abf5f6bc10">3f5986eee360f12e6a0bb77aa46f95abf5f6bc10</ulink>
@@ -1386,7 +1386,7 @@
     2022-05-31 [5cacb7db]
     -->
     <para>
-     When CloseComplete is received, foward to frontend without buffering. (Tatsuo Ishii)
+     When CloseComplete is received, forward to frontend without buffering. (Tatsuo Ishii)
     </para>
     <para>
      It seems this caused occasional timeout error in 074.bug700_memqcache_segfault.
@@ -1497,7 +1497,7 @@
        <para>
         Fix process memory requirement. Previously the formula was based on
         RSS. However PSS should be used because RSS includes shared memory
-        such as the memory used for libraries. This resuls in lot smaller
+        such as the memory used for libraries. This results in lot smaller
         memory requirement than before.
        </para>
       </listitem>
@@ -1742,7 +1742,7 @@
     2022-04-17 [29734b5]
     -->
     <para>
-     Enhance regression test 018.detach_primary to avoid the timeut error. (Tatsuo Ishii)
+     Enhance regression test 018.detach_primary to avoid the timeout error. (Tatsuo Ishii)
     </para>
    </listitem>
 
@@ -1751,7 +1751,7 @@
     2022-04-17 [72d31b0]
     -->
     <para>
-     Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii)
+     Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii)
     </para>
    </listitem>
 
@@ -2229,7 +2229,7 @@
      Fix the incorrect display of load balancing node in raw mode. (Bo Peng)
     </para>
     <para>
-     In raw mode, <productname>Pgpool-II</productname> sends all queies to main node.
+     In raw mode, <productname>Pgpool-II</productname> sends all queries to main node.
      This is harmless, but it may confuse users.
     </para>
    </listitem>
@@ -3948,7 +3948,7 @@
      startup user is changed to <literal>postgres</literal> user.
     </para>
     <para>
-     If installing from RPMs, <literal>postrges</literal> user will be allowed to
+     If installing from RPMs, <literal>postgres</literal> user will be allowed to
      run <varname>if_up/down_cmd</varname> and <varname>arping_cmd</varname>
      with <command>sudo</command> without a password.
      If <varname>if_up/down_cmd</varname> or <varname>arping_cmd</varname> starts with "/",
diff --git a/src/auth/pool_passwd.c b/src/auth/pool_passwd.c
index 70d49ec1..ea971070 100644
--- a/src/auth/pool_passwd.c
+++ b/src/auth/pool_passwd.c
@@ -452,7 +452,7 @@ pool_reopen_passwd_file(void)
 
 /*
  * function first uses the password in the argument, if the argument is empty
- * string or NULL, it looks for the password for uset in pool_passwd file.
+ * string or NULL, it looks for the password for user in pool_passwd file.
  * The returned password is always in plain text or md5 hashed and palloc'd
  * (if not null)
  */
diff --git a/src/config/README b/src/config/README
index f8bfecc5..c74ecba7 100644
--- a/src/config/README
+++ b/src/config/README
@@ -37,7 +37,7 @@ defined above to src/include/pool_config.h.
 							 * will not be load balanced until the session ends.
 							 */
 
-Step3: Add config_emum_entry array to src/config/pool_config.c.
+Step3: Add config_enum_entry array to src/config/pool_config.c.
 ================================================================
 
 static const struct config_enum_entry disable_load_balance_on_write_options[] = {
diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c
index 26c4fee8..b737a750 100644
--- a/src/config/pool_config_variables.c
+++ b/src/config/pool_config_variables.c
@@ -292,7 +292,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 	{
 		{"failover_require_consensus", CFGCXT_INIT, FAILOVER_CONFIG,
-			"Only do failover when majority aggrees.",
+			"Only do failover when majority agrees.",
 			CONFIG_VAR_TYPE_BOOL, false, 0
 		},
 		&g_pool_config.failover_require_consensus,
diff --git a/src/include/pool_config.h b/src/include/pool_config.h
index 541534e7..0ccf8681 100644
--- a/src/include/pool_config.h
+++ b/src/include/pool_config.h
@@ -473,7 +473,7 @@ typedef struct
 	bool		failover_when_quorum_exists;	/* Do failover only when wd
 												 * cluster holds the quorum */
 	bool		failover_require_consensus; /* Only do failover when majority
-											 * aggrees */
+											 * agrees */
 	bool		allow_multiple_failover_requests_from_node; /* One Pgpool-II node
 															 * can send multiple
 															 * failover requests to
diff --git a/src/include/query_cache/pool_memqcache.h b/src/include/query_cache/pool_memqcache.h
index bf83c719..1e186b6c 100644
--- a/src/include/query_cache/pool_memqcache.h
+++ b/src/include/query_cache/pool_memqcache.h
@@ -39,7 +39,7 @@
  * block". Each block is assigned a "cache block id", which is
  * starting with 0.
  */
-typedef char *POOL_CACH_BLOCK;	/* pointer to cache block */
+typedef char *POOL_CACHE_BLOCK;	/* pointer to cache block */
 typedef unsigned int POOL_CACHE_BLOCKID;	/* cache block id */
 typedef unsigned int POOL_CACHE_ITEMID; /* cache item id */
 
diff --git a/src/main/health_check.c b/src/main/health_check.c
index 45628d3f..50981c11 100644
--- a/src/main/health_check.c
+++ b/src/main/health_check.c
@@ -242,13 +242,13 @@ establish_persistent_connection(int node)
 	/*
 	 * If the node is already in down status or unused, do nothing.
 	 * except when the node state is down because of quarantine operation
-	 * since we want to detect when the node cames back to life again to
+	 * since we want to detect when the node comes back to life again to
 	 * remove it from the quarantine state
 	 */
 	if (bkinfo->backend_status == CON_UNUSED ||
 		(bkinfo->backend_status == CON_DOWN && bkinfo->quarantine == false))
 	{
-		/* get current time to use auto_faliback_interval */
+		/* get current time to use auto_failback_interval */
 		now = time(NULL);
 
 		if (pool_config->auto_failback && auto_failback_interval < now &&
@@ -352,7 +352,7 @@ establish_persistent_connection(int node)
 		{
 				ereport(LOG,
 					(errmsg("request auto failback, node id:%d", node)));
-				/* get current time to use auto_faliback_interval */
+				/* get current time to use auto_failback_interval */
 				now = time(NULL);
 				auto_failback_interval = now + pool_config->auto_failback_interval;
 
diff --git a/src/main/main.c b/src/main/main.c
index b135f4d6..9801928b 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -524,7 +524,7 @@ stop_me(void)
 
 	for (;;)
 	{
-		int		cnt = 5;	/* sending sinal retry interval */
+		int		cnt = 5;	/* sending signal retry interval */
 
 		if (kill(pid, stop_sig) == -1)
 		{
diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c
index 418a2fd5..a064ffa6 100644
--- a/src/main/pgpool_main.c
+++ b/src/main/pgpool_main.c
@@ -3994,7 +3994,7 @@ read_status_file(bool discard_status)
 	}
 
 	/*
-	 * Frist try out with old format file.
+	 * First try out with old format file.
 	 */
 	is_old_format = true;
 
diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c
index 5722a5a9..67fa3ff2 100644
--- a/src/protocol/pool_process_query.c
+++ b/src/protocol/pool_process_query.c
@@ -970,7 +970,7 @@ ParameterStatus(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend)
 	}
 	else
 		ereport(ERROR,
-				(errmsg("ParameterStatus: failed to obatain parameter name, value from the main node.")));
+				(errmsg("ParameterStatus: failed to obtain parameter name, value from the main node.")));
 	return status;
 }
 
diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c
index babc5f98..a2d3205f 100644
--- a/src/protocol/pool_proto_modules.c
+++ b/src/protocol/pool_proto_modules.c
@@ -1654,7 +1654,7 @@ Describe(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend,
 	{
 		/*
 		 * It is possible that client wants to use the portal created by
-		 * DECLARE CUSOR or pl/pgSQL function. If so, the describe message
+		 * DECLARE CURSOR or pl/pgSQL function. If so, the describe message
 		 * should only be sent to primary node.
 		 */
 		query_context = create_dummy_query_context();
diff --git a/src/rewrite/pool_timestamp.c b/src/rewrite/pool_timestamp.c
index 63569759..a7e99b8f 100644
--- a/src/rewrite/pool_timestamp.c
+++ b/src/rewrite/pool_timestamp.c
@@ -780,7 +780,7 @@ rewrite_timestamp_update(UpdateStmt *u_stmt, TSRewriteContext * ctx)
 /*
  * Rewrite `now()' to timestamp literal.
  * If rewrite_to_params is false then, we rewrite `now()' to timestamp constant.
- * Otherwize, we rewrite `now()' to params and expand that at Bind message.
+ * Otherwise, we rewrite `now()' to params and expand that at Bind message.
  * returns query string as palloced string, or NULL if not to need rewrite.
  */
 char *
@@ -1142,7 +1142,7 @@ bind_rewrite_timestamp(POOL_CONNECTION_POOL * backend,
 				copy_to += sizeof(int16);
 			}
 		}
-		/* otherwize, copy the original format codes as they are*/
+		/* otherwise, copy the original format codes as they are*/
 		else
 		{
 			copy_len = num_formats * sizeof(int16);
diff --git a/src/streaming_replication/pool_worker_child.c b/src/streaming_replication/pool_worker_child.c
index 05f4bd69..118906df 100644
--- a/src/streaming_replication/pool_worker_child.c
+++ b/src/streaming_replication/pool_worker_child.c
@@ -193,7 +193,7 @@ do_worker_child(void)
 			Req_info->switching == false)
 		{
 			/*
-			 * Acquire follow primary lock. If fail to acqure lock, try again.
+			 * Acquire follow primary lock. If fail to acquire lock, try again.
 			 */
 			follow_primary_lock_acquired = false;
 
diff --git a/src/tools/pgproto/buffer.c b/src/tools/pgproto/buffer.c
index 1351821a..74f4d9ec 100644
--- a/src/tools/pgproto/buffer.c
+++ b/src/tools/pgproto/buffer.c
@@ -29,7 +29,7 @@
 #include "pgproto/buffer.h"
 
 /*
- * Read integer field and returns it.  The pointer in the buffer afer reading
+ * Read integer field and returns it.  The pointer in the buffer after reading
  * the data is returned to "bufp".  If the format is not follows above, exit
  * within this function.
  */
diff --git a/src/tools/pgproto/extended_query.c b/src/tools/pgproto/extended_query.c
index 8a744d37..54204549 100644
--- a/src/tools/pgproto/extended_query.c
+++ b/src/tools/pgproto/extended_query.c
@@ -219,7 +219,7 @@ process_bind(char *buf, PGconn *conn)
 
 	send_char('B', conn);
 	send_int(len, conn);	/* message length */
-	send_string(portal, conn);	/* protal name */
+	send_string(portal, conn);	/* portal name */
 	free(portal);
 	send_string(stmt, conn);	/* statement name */
 	free(stmt);
diff --git a/src/utils/pool_relcache.c b/src/utils/pool_relcache.c
index 731be162..d873ce70 100644
--- a/src/utils/pool_relcache.c
+++ b/src/utils/pool_relcache.c
@@ -129,7 +129,7 @@ pool_search_relcache(POOL_RELCACHE * relcache, POOL_CONNECTION_POOL * backend, c
 
 	/*
 	 * Obtain database name and node id to be sent query.  If
-	 * relcache_query_target is RELQTARGET_LOADL_BALANCE_NODE, we consider
+	 * relcache_query_target is RELQTARGET_LOAD_BALANCE_NODE, we consider
 	 * load balance node id to be used to send queries.
 	 * 
 	 * Note that we need to use VALID_BACKEND_RAW, rather than VALID_BACKEND
diff --git a/src/utils/pool_shmem.c b/src/utils/pool_shmem.c
index c46d9c54..0ec7b021 100644
--- a/src/utils/pool_shmem.c
+++ b/src/utils/pool_shmem.c
@@ -76,7 +76,7 @@ pool_shared_memory_create(size_t size)
 }
 
 /*
- * Removes a shared memory segment from process' address spaceq (called as
+ * Removes a shared memory segment from process' address space (called as
  * an on_shmem_exit callback, hence funny argument list)
  */
 static void
diff --git a/src/utils/pool_ssl.c b/src/utils/pool_ssl.c
index 0d654652..15586db0 100644
--- a/src/utils/pool_ssl.c
+++ b/src/utils/pool_ssl.c
@@ -127,7 +127,7 @@ pool_ssl_negotiate_clientserver(POOL_CONNECTION * cp)
 				ereport(FATAL,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
 						 errmsg("received unencrypted data after SSL request"),
-						 errdetail("This could be an evidence of an attempted man-in-the-middle attacck.")));
+						 errdetail("This could be an evidence of an attempted man-in-the-middle attack.")));
 			}
 
 			SSL_set_fd(cp->ssl, cp->fd);
@@ -182,7 +182,7 @@ pool_ssl_negotiate_serverclient(POOL_CONNECTION * cp)
 			ereport(FATAL,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
 					 errmsg("received unencrypted data after SSL request"),
-					 errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attacck.")));
+					 errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attack.")));
 		}
 
 		SSL_set_fd(cp->ssl, cp->fd);
@@ -258,7 +258,7 @@ retry:
 			 * indicate that the underlying transport has been closed.
 			 * -------------------------------------------------------------
 			 * We don't want to trigger failover but it is also possible that
-			 * the connectoon has been closed. So returns 0 to ask pool_read()
+			 * the connection has been closed. So returns 0 to ask pool_read()
 			 * to close connection to frontend.
 			 */
 			ereport(WARNING,
diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c
index d2754d34..0af351b4 100644
--- a/src/watchdog/watchdog.c
+++ b/src/watchdog/watchdog.c
@@ -5397,7 +5397,7 @@ watchdog_state_machine_loading(WD_EVENTS event, WatchdogNode * wdNode, WDPacketD
  * This is the intermediate state before going to cluster initialization
  * here we update the information of all connected nodes and move to the
  * initialization state. moving to this state from loading does not make
- * much sence as at loading time we already have updated node informations
+ * much sense as at loading time we already have updated node informations
  */
 static int
 watchdog_state_machine_joining(WD_EVENTS event, WatchdogNode * wdNode, WDPacketData * pkt, WDCommandData * clusterCommand)