Merge branch 'master' of https://github.com/Steve888888/pgdoc-cn

Author: Steve888888

postgresql/doc/src/sgml/install-windows.sgml

@@ -308,7 +308,7 @@ ____________________________________________________________________________-->
     <varlistentry>
      <term><productname>ActiveState Perl</productname></term>
      <listitem><para>
-      ActiveState Perl被用来运行构建生成脚本。MinGW或Cygwin Perl是不符合要求的。AcitveState Perl也必须存在于PATH中。其二进制文件可以从<ulink url="http://www.activestate.com"></ulink>下载（注意：需要版本5.8.3及以上，免费标准发布就足够了）。
+      ActiveState Perl被用来运行构建生成脚本。MinGW或Cygwin Perl是不符合要求的。AcitveState Perl也必须存在于PATH中。其二进制文件可以从<ulink url="https://www.activestate.com"></ulink>下载（注意：需要版本5.8.3及以上，免费标准发布就足够了）。
      </para></listitem>
     </varlistentry>
 

postgresql/doc/src/sgml/ltree.sgml

@@ -889,34 +889,34 @@ ____________________________________________________________________________-->
      <row>
       <entry><function>lca(ltree, ltree, ...)</function><indexterm><primary>lca</primary></indexterm></entry>
       <entry><type>ltree</type></entry>
-      <entry>lowest common ancestor, i.e., longest common prefix of paths
+      <entry>longest common ancestor of paths
        (up to 8 arguments supported)</entry>
-      <entry><literal>lca('1.2.2.3','1.2.3.4.5.6')</literal></entry>
+      <entry><literal>lca('1.2.3','1.2.3.4.5.6')</literal></entry
       <entry><literal>1.2</literal></entry>
      </row>
 ____________________________________________________________________________-->
      <row>
       <entry><function>lca(ltree, ltree, ...)</function><indexterm><primary>lca</primary></indexterm></entry>
       <entry><type>ltree</type></entry>
-      <entry>最低公共祖先，即最长的公共路径前缀（最多支持 8 个参数）</entry>
-      <entry><literal>lca('1.2.2.3','1.2.3.4.5.6')</literal></entry>
+      <entry>路径的最长公共祖先（最多支持 8 个参数）</entry>
+      <entry><literal>lca('1.2.3','1.2.3.4.5.6')</literal></entry
       <entry><literal>1.2</literal></entry>
      </row>
 
 <!--==========================orignal english content==========================
      <row>
       <entry><function>lca(ltree[])</function></entry>
       <entry><type>ltree</type></entry>
-      <entry>lowest common ancestor, i.e., longest common prefix of paths</entry>
-      <entry><literal>lca(array['1.2.2.3'::ltree,'1.2.3'])</literal></entry>
+      <entry>longest common ancestor of paths in array</entry>
+      <entry><literal>lca(array['1.2.3'::ltree,'1.2.3.4'])</literal></entry>
       <entry><literal>1.2</literal></entry>
      </row>
 ____________________________________________________________________________-->
      <row>
       <entry><function>lca(ltree[])</function></entry>
       <entry><type>ltree</type></entry>
-      <entry>最低公共祖先，即最长的公共路径前缀</entry>
-      <entry><literal>lca(array['1.2.2.3'::ltree,'1.2.3'])</literal></entry>
+      <entry>数组中路径的最长公共祖先</entry>
+      <entry><literal>lca(array['1.2.3'::ltree,'1.2.3.4'])</literal></entry>
       <entry><literal>1.2</literal></entry>
      </row>
 

postgresql/doc/src/sgml/pgrowlocks.sgml

@@ -146,7 +146,7 @@ ____________________________________________________________________________-->
      </row>
 <!--==========================orignal english content==========================
      <row>
-      <entry><structfield>lock_type</structfield></entry>
+      <entry><structfield>modes</structfield></entry>
       <entry><type>text[]</type></entry>
       <entry>Lock mode of lockers (more than one if multitransaction),
        an array of <literal>Key Share</>, <literal>Share</>,
@@ -155,7 +155,7 @@ ____________________________________________________________________________-->
      </row>
 ____________________________________________________________________________-->
      <row>
-      <entry><structfield>lock_type</structfield></entry>
+      <entry><structfield>modes</structfield></entry>
       <entry><type>text[]</type></entry>
       <entry>持锁者的锁模式（如果是多事务则多于一个），是一个<literal>Key Share</literal>、<literal>Share</literal>、<literal>For No Key Update</literal>、<literal>No Key Update</literal>、<literal>For Update</literal>、<literal>Update</literal>组成的数组。</entry>
      </row>

postgresql/doc/src/sgml/ref/do.sgml

@@ -154,12 +154,12 @@ ____________________________________________________________________________-->
 <!--==========================orignal english content==========================
   <para>
    The procedural language to be used must already have been installed
-   into the current database by means of <command>CREATE LANGUAGE</>.
+   into the current database by means of <command>CREATE EXTENSION</>.
    <literal>plpgsql</> is installed by default, but other languages are not.
   </para>
 ____________________________________________________________________________-->
   <para>
-   要使用的过程语言必须已经用<command>CREATE LANGUAGE</command>安装在
+   要使用的过程语言必须已经用<command>CREATE EXTENSION</command>安装在
    当前数据库中。默认已经安装了<literal>plpgsql</literal>，但是其他语言没有被
    安装。
   </para>

postgresql/doc/src/sgml/ref/drop_function.sgml

@@ -231,7 +231,7 @@ ____________________________________________________________________________-->
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-DROPFUNCTION-examples">
+ <refsect1 id="sql-dropfunction-examples">
 <!--==========================orignal english content==========================
   <title>Examples</title>
 ____________________________________________________________________________-->
@@ -295,7 +295,7 @@ DROP FUNCTION update_employee_salaries();
   </para>
  </refsect1>
 
- <refsect1 id="SQL-DROPFUNCTION-compatibility">
+ <refsect1 id="sql-dropfunction-compatibility">
 <!--==========================orignal english content==========================
   <title>Compatibility</title>
 ____________________________________________________________________________-->