Merge branch 'master' of https://github.com/chegong18/pgdoc14-cn

Author: chegong18

COPYRIGHT

@@ -0,0 +1,23 @@
+PostgreSQL Database Management System
+(formerly known as Postgres, then as Postgres95)
+
+Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+
+Portions Copyright (c) 1994, The Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement
+is hereby granted, provided that the above copyright notice and this
+paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

README.md

@@ -112,6 +112,11 @@ https://github.com/postgres-cn/pgdoc-cn/releases
 
 关于html页面和sgml文件的对应关系，可通过点击“在线阅读”web页面右上角的“纠错本页面”链接跳转到Github仓库中的相应sgml文件的编辑页面。
 
+
+## 关于许可
+关于本翻译文档的使用，遵从[PostgreSQL licence](https://www.postgresql.org/about/licence/)。
+
+
 ## 其它
 1. Github仓库中的sgml文件编码是UTF8。
 2. Github仓库中的修正会由不定期的反映到在线中文手册中，如果发生了编译错误，可查看相应版本的日志文件，比如：[http://postgres.cn/docs/13/build.log](http://postgres.cn/docs/13/build.log)。

postgresql/doc/src/sgml/btree.sgml

@@ -1036,7 +1036,7 @@ ____________________________________________________________________________-->
    在 MVCC下B-Tree索引不能直接感知，同一个逻辑表行可能存在多个现存版本;对于一个索引来说，每个元组都是一个需要其自己的索引条目的独立的对象。
    <quote>Version churn</quote>元组有时可能会积累，并且对查询延迟和吞吐量产生影响。
    这通常发生在<command>UPDATE</command>较为繁重的工作负载中，其中大多数单独的更新不能应用<acronym>HOT</acronym>优化。
-   在<command>UPDATE</command>更改仅一个被一个索引覆盖的列期间，<emphasis>总是</emphasis> 需要一个新的索引元组 &mdash；一个用于表上的<emphasis>each and every</emphasis>索引。
+   在<command>UPDATE</command>更改仅一个被一个索引覆盖的列期间，<emphasis>总是</emphasis> 需要一个新的索引元组 &mdash;一个用于表上的<emphasis>each and every</emphasis>索引。
    特别注意，这包括没有被<command>UPDATE</command>进行<quote>logically modified</quote>的索引。
    所有索引将需要一个后继的物理索引元组，用于指向表中的最新版本。
    每个索引中的每个新元组通常需要与原始的<quote>updated</quote>元组共存很短一段时间(通常直到<command>UPDATE</command>事务提交后不久)。

postgresql/doc/src/sgml/catalogs.sgml

@@ -2694,7 +2694,7 @@ ____________________________________________________________________________-->
       </para>
       <para>
        The defined collation of the column, or zero if the column is
-       not of a collatable data type.
+       not of a collatable data type
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -4966,7 +4966,7 @@ ____________________________________________________________________________-->
        (references <link linkend="catalog-pg-type"><structname>pg_type</structname></link>.<structfield>oid</structfield>)
       </para>
       <para>
-       The domain this constraint is on; 0 if not a domain constraint
+       The domain this constraint is on; zero if not a domain constraint
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -10142,7 +10142,7 @@ ____________________________________________________________________________-->
        (references <link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.<structfield>oid</structfield>)
       </para>
       <para>
-       Negator of this operator,  (zero if none)
+       Negator of this operator (zero if none)
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -11439,7 +11439,7 @@ ____________________________________________________________________________-->
        <structfield>proargmodes</structfield> <type>char[]</type>
       </para>
       <para>
-       An array of the data types of the function arguments.  This include
+       An array of the modes of the function arguments, encoded as
        <literal>i</literal> for <literal>IN</literal> arguments,
        <literal>o</literal> for <literal>OUT</literal> arguments,
        <literal>b</literal> for <literal>INOUT</literal> arguments,
@@ -14257,7 +14257,6 @@ ____________________________________________________________________________-->
        <literal>m</literal> for most common values (MCV) list statistics, and
        <literal>e</literal> for expression statistics
       </para></entry>
-      </para></entry>
      </row>
 ____________________________________________________________________________-->
      <row>
@@ -14663,7 +14662,7 @@ ____________________________________________________________________________-->
        <structfield>subenabled</structfield> <type>bool</type>
       </para>
       <para>
-       If true, the subscription is enabled and should be replicating.
+       If true, the subscription is enabled and should be replicating
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -25021,7 +25020,7 @@ ____________________________________________________________________________-->
        (references <link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>.<structfield>rolname</structfield>)
       </para>
       <para>
-       Owner of the extended statistics
+       Owner of the extended statistics object
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -25284,7 +25283,7 @@ ____________________________________________________________________________-->
   </para>
 ____________________________________________________________________________-->
   <para>
-   <structname>pg_stats_ext_exprs</structname>也被设计为以比底层目录更方便阅读的格式来展现信息 &mdash；相应的代价是当 <structname>pg_statistic_ext</structname>中的统计信息的结构发生改变时，必须扩展其模式。
+   <structname>pg_stats_ext_exprs</structname>也被设计为以比底层目录更方便阅读的格式来展现信息 &mdash; 相应的代价是当 <structname>pg_statistic_ext</structname>中的统计信息的结构发生改变时，必须扩展其模式。
   </para>
 
   <table>
@@ -25595,7 +25594,7 @@ ____________________________________________________________________________-->
       <para>
        表达式的值的物理行排序和逻辑排序之间的统计相关性。这个范围从-1 到 +1。
        当该值接近-1或+1时，对表达式的索引扫描预计要比接近零的时候更便宜，因为减少了对磁盘的随机访问。
-       (如果表达式的数据类型没有<literal>&lt;</literal><操作符，则该表达式为空。)
+       (如果表达式的数据类型没有<literal>&lt;</literal>操作符，则该表达式为空。)
       </para></entry>
      </row>
 

postgresql/doc/src/sgml/client-auth.sgml

@@ -692,7 +692,7 @@ hostnogssenc  <replaceable>database</replaceable>  <replaceable>user</replaceabl
        format. To see the <literal>DN</literal> of a client certificate
        in this format, do
 <programlisting>
-openssl x509 -in myclient.crt -noout --subject -nameopt RFC2253 | sed "s/^subject=//"
+openssl x509 -in myclient.crt -noout -&minus;subject -nameopt RFC2253 | sed "s/^subject=//"
 </programlisting>
         Care needs to be taken when using this option, especially when using
         regular expression matching against the <literal>DN</literal>.
@@ -1706,7 +1706,7 @@ ____________________________________________________________________________-->
     </listitem>
     <listitem>
      <para>
-      <link linkend="auth-cert">Certificate authentication</link>, 需要SLL连接和通过SSL证书检查的认证用户。
+      <link linkend="auth-cert">Certificate authentication</link>, 需要SSL连接和通过SSL证书检查的认证用户。
      </para>
     </listitem>
     <listitem>

postgresql/doc/src/sgml/config.sgml

@@ -1885,7 +1885,7 @@ ____________________________________________________________________________-->
         <filename>FILE:/usr/local/pgsql/etc/krb5.keytab</filename>
         (where the directory part is whatever was specified
         as <varname>sysconfdir</varname> at build time; use
-        <literal>pg_config --sysconfdir</literal> to determine that).
+        <literal>pg_config -&minus;sysconfdir</literal> to determine that).
         If this parameter is set to an empty string, it is ignored and a
         system-dependent default is used.
         This parameter can only be set in the
@@ -2583,6 +2583,16 @@ ____________________________________________________________________________-->
         有效的版本为 <xref linkend="guc-ssl-min-protocol-version"/>, 添加一个空字符串，允许任何协议版本。
         默认为允许任何版本。设置最大协议版本主要用于测试，或者某个组件在与较新的协议配合工作时出现了问题。
        </para>
+
+<!--==========================orignal english content==========================
+       <para>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
+        file or on the server command line.
+       </para>
+____________________________________________________________________________-->
+       <para>
+        此参数只能在<filename>postgresql.conf</filename>文件或服务器命令行中设置。
+       </para>
       </listitem>
      </varlistentry>
 
@@ -4267,7 +4277,7 @@ ____________________________________________________________________________-->
 <!--==========================orignal english content==========================
         <para>
          When running a standby server, you must set this parameter to the
-         same or higher value than on the master server. Otherwise, queries
+         same or higher value than on the primary server. Otherwise, queries
          will not be allowed in the standby server.
         </para>
 ____________________________________________________________________________-->
@@ -14321,6 +14331,43 @@ ____________________________________________________________________________-->
       </listitem>
      </varlistentry>
 
+     <varlistentry id="guc-transaction-isolation" xreflabel="transaction_isolation">
+<!--==========================orignal english content==========================
+      <term><varname>transaction_isolation</varname> (<type>enum</type>)
+      <indexterm>
+       <primary>transaction isolation level</primary>
+      </indexterm>
+      <indexterm>
+       <primary><varname>transaction_isolation</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+____________________________________________________________________________-->
+      <term><varname>transaction_isolation</varname> (<type>enum</type>)
+      <indexterm>
+       <primary>transaction isolation level</primary>
+      </indexterm>
+      <indexterm>
+       <primary><varname>transaction_isolation</varname>配置参数</primary>
+      </indexterm>
+      </term>
+      <listitem>
+<!--==========================orignal english content==========================
+       <para>
+        This parameter reflects the current transaction's isolation level.
+        At the beginning of each transaction, it is set to the current value
+        of <xref linkend="guc-default-transaction-isolation"/>.
+        Any subsequent attempt to change it is equivalent to a <xref
+        linkend="sql-set-transaction"/> command.
+       </para>
+____________________________________________________________________________-->
+       <para>
+        此参数反映当前事务的隔离级别。在每个事务开始时，它被设置为
+        <xref linkend="guc-default-transaction-isolation"/>的当前值。
+        任何后续更改它的尝试都相当于<xref linkend="sql-set-transaction"/>命令。
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry id="guc-transaction-read-only" xreflabel="transaction_read_only">
 <!--==========================orignal english content==========================
       <term><varname>transaction_read_only</varname> (<type>boolean</type>)

postgresql/doc/src/sgml/cube.sgml

@@ -439,19 +439,6 @@ ____________________________________________________________________________-->
    </tgroup>
   </table>
 
-<!--==========================orignal english content==========================
-  <para>
-   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were
-   respectively called <literal>@</literal> and <literal>~</literal>.  These names are still available, but are
-   deprecated and will eventually be retired.  Notice that the old names
-   are reversed from the convention formerly followed by the core geometric
-   data types!)
-  </para>
-____________________________________________________________________________-->
-  <para>
-   （在 PostgreSQL 8.2 之前，包含操作符<literal>@&gt;</literal>和<literal>&lt;@</literal>分别被称为<literal>@</literal>和<literal>~</literal>。这些名称仍然可用，但是已经被废弃并且最终将会退休。注意旧的名字与之前核心几何数据类型遵循的习惯相反！）
-  </para>
-
 <!--==========================orignal english content==========================
   <para>
    In addition to the above operators, the usual comparison
@@ -613,7 +600,7 @@ ____________________________________________________________________________-->
         Makes a one dimensional cube.
        </para>
        <para>
-        <literal>cube(1,2)</literal>
+        <literal>cube(1, 2)</literal>
         <returnvalue>(1),(2)</returnvalue>
        </para></entry>
       </row>