Merge pull request #401 from chegong18/master

update Catalogs.sgml, charset.sgml,client-auth.sgml and config.sgml

Author: ChenHuajun

postgresql/doc/src/sgml/catalogs.sgml

@@ -236,8 +236,9 @@ ____________________________________________________________________________-->
         <listitem>
          <para>
           The value of this parameter overrides the
-          <xref linkend="guc-synchronous-commit"/> setting.  The default
-          value is <literal>off</literal>.
+          <xref linkend="guc-synchronous-commit"/> setting within this
+          subscription's apply worker processes.  The default value
+          is <literal>off</literal>.
          </para>
 
          <para>
@@ -262,6 +263,27 @@ ____________________________________________________________________________-->
         </listitem>
        </varlistentry>
 
+       <varlistentry>
+        <term><literal>binary</literal> (<type>boolean</type>)</term>
+        <listitem>
+         <para>
+          Specifies whether the subscription will request the publisher to
+          send the data in binary format (as opposed to text).
+          The default is <literal>false</literal>.
+          Even when this option is enabled, only data types that have
+          binary send and receive functions will be transferred in binary.
+         </para>
+
+         <para>
+          When doing cross-version replication, it could happen that the
+          publisher has a binary send function for some data type, but the
+          subscriber lacks a binary receive function for the type.  In
+          such a case, data transfer will fail, and
+          the <literal>binary</literal> option cannot be used.
+         </para>
+        </listitem>
+       </varlistentry>
+
        <varlistentry>
         <term><literal>connect</literal> (<type>boolean</type>)</term>
         <listitem>
@@ -290,6 +312,17 @@ ____________________________________________________________________________-->
          </para>
         </listitem>
        </varlistentry>
+       <varlistentry>
+        <term><literal>streaming</literal> (<type>boolean</type>)</term>
+        <listitem>
+         <para>
+          Specifies whether streaming of in-progress transactions should
+          be enabled for this subscription.  By default, all transactions
+          are fully decoded on the publisher, and only then sent to the
+          subscriber as a whole.
+         </para>
+        </listitem>
+       </varlistentry>
       </variablelist></para>
 ____________________________________________________________________________-->
      <para>
@@ -345,7 +378,7 @@ ____________________________________________________________________________-->
         <term><literal>synchronous_commit</literal> (<type>enum</type>)</term>
         <listitem>
          <para>
-          该参数的值会覆盖<xref linkend="guc-synchronous-commit"/>设置。
+          在这个订阅的应用worker进程时，该参数的值会覆盖<xref linkend="guc-synchronous-commit"/>设置。
 		  默认值是<literal>off</literal>。
          </para>
 
@@ -366,6 +399,22 @@ ____________________________________________________________________________-->
         </listitem>
        </varlistentry>
 
+       <varlistentry>
+        <term><literal>binary</literal> (<type>boolean</type>)</term>
+        <listitem>
+         <para>
+          指定订阅是否要求发布器以二进制格式(相对的是文本格式)发送数据。
+          默认值是<literal>false</literal>。
+          即使此选项被启用，也只有具备二进制发送和接收函数的数据类型将以二进制传输。
+         </para>
+
+         <para>
+          在进行跨版本复制时，可能会出现发布器具有某些数据类型的二进制发送函数，但订阅器缺乏针对此类型的二进制接收函数的情况。
+          在这种情况下，数据传输将失败，并且<literal>binary</literal>选项不能被使用。
+         </para>
+        </listitem>
+       </varlistentry>
+
        <varlistentry>
         <term><literal>connect</literal> (<type>boolean</type>)</term>
         <listitem>
@@ -388,8 +437,16 @@ ____________________________________________________________________________-->
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+       <varlistentry>
+        <term><literal>streaming</literal> (<type>boolean</type>)</term>
+        <listitem>
+         <para>
+          指定是否对此订阅启用进行中事务的流。
+          默认情况下，所有事务都在发布器上完全解码，直到那时才作为整体发送给订阅器。
+         </para>
+        </listitem>
+       </varlistentry>
+      </variablelist></para>
     </listitem>
    </varlistentry>
   </variablelist>