Merge pull request #393 from sirlipeng/master

翻译14.1 2022/09/08 sirlipeng

Author: ChenHuajun

postgresql/doc/src/sgml/docguide.sgml

@@ -274,14 +274,17 @@ ____________________________________________________________________________-->
    You can get away with not installing DocBook XML and the DocBook XSLT
    stylesheets locally, because the required files will be downloaded from the
    Internet and cached locally.  This may in fact be the preferred solution if
-   your operating system packages provide only an old version of especially
-   the stylesheets or if no packages are available at all.  See
-   the <option>-&minus;nonet</option> option for <command>xmllint</command>
-   and <command>xsltproc</command> for more information.
+   your operating system packages provide only an old version of these files,
+   or if no packages are available at all.
+   If you want to prevent any attempt to access the Internet while building
+   the documentation, you need to pass the <option>-&minus;nonet</option> option
+   to <command>xmllint</command> and <command>xsltproc</command>; see below
+   for an example.
   </para>
 ____________________________________________________________________________-->
   <para>
-   你可以在本地不安装DocBook XML和DocBook XSLT样式表的情况下开始工作，因为所需的文件将从Internet下载下来并且缓存在本地。如果你的操作系统包仅提供了旧版本的样式表或者根本就没有所需的包，那么这种方式实际上是最好的解决方案。更多信息请见<command>xmllint</command>和<command>xsltproc</command>的<option>--nonet</option>选项。
+   你可以在本地不安装DocBook XML和DocBook XSLT样式表的情况下开始工作，因为所需的文件将从Internet下载下来并且缓存在本地。如果你的操作系统包仅提供这些文件的旧版本，或者根本没有可用的包，则这实际上可能是首选解决方案。
+   如果你想在构建文档时阻止任何访问Internet的尝试，你需要将<option>--nonet</option>选项传递给<command>xmllint</command>和<command>xsltproc</command>；参见下面的示例。
   </para>
 
   <sect2>
@@ -412,31 +415,60 @@ ____________________________________________________________________________-->
 <!--==========================orignal english content==========================
   <para>
    Before you can build the documentation you need to run the
-   <filename>configure</filename> script as you would when building
+   <filename>configure</filename> script, as you would when building
    the <productname>PostgreSQL</productname> programs themselves.
-   Check the output near the end of the run, it should look something
+   Check the output near the end of the run; it should look something
    like this:
 <screen>
 checking for xmllint... xmllint
-checking for DocBook XML V4.5... yes
-checking for dbtoepub... dbtoepub
 checking for xsltproc... xsltproc
 checking for fop... fop
+checking for dbtoepub... dbtoepub
+</screen>
+  If <filename>xmllint</filename> or <filename>xsltproc</filename> is not
+   found, you will not be able to build any of the documentation.
+   <filename>fop</filename> is only needed to build the documentation in
+   PDF format.
+   <filename>dbtoepub</filename> is only needed to build the documentation
+   in EPUB format.
+  </para>
+
+  <para>
+   If necessary, you can tell <filename>configure</filename> where to find
+   these programs, for example
+<screen>
+./configure ... XMLLINT=/opt/local/bin/xmllint ...
+</screen>
+   Also, if you want to ensure that <filename>xmllint</filename>
+   and <filename>xsltproc</filename> will not perform any network access,
+   you can do something like
+<screen>
+./configure ... XMLLINT="xmllint -&minus;nonet" XSLTPROC="xsltproc -&minus;nonet" ...
 </screen>
-   If <filename>xmllint</filename> was not found then some of the following
-   tests will be skipped.
   </para>
 ____________________________________________________________________________-->
   <para>
-   在你能编译文档之前，你需要运行<filename>configure</filename>脚本，就像你在编译<productname>PostgreSQL</productname>程序本身时所作的那样。检查运行末尾附近的输出，应该看起来像这样：
+   在你能编译文档之前，你需要运行<filename>configure</filename>脚本，就像你在编译<productname>PostgreSQL</productname>程序本身时所作的那样。检查运行末尾附近的输出;它应该看起来像这样：
 <screen>
 checking for xmllint... xmllint
-checking for DocBook XML V4.5... yes
-checking for dbtoepub... dbtoepub
 checking for xsltproc... xsltproc
 checking for fop... fop
+checking for dbtoepub... dbtoepub
+</screen>
+   如果未找到<filename>xmllint</filename>或<filename>xsltproc</filename>，你将无法构建任何文档<filename>fop</filename>仅用于在中构建文档
+PDF格式。
+<filename>dbtoepub</filename>仅用于以EPUB格式构建文档。
+  </para>
+
+  <para>
+   如果需要，你可以告诉<filename>configure</filename>到哪里去找这些程序，例如
+<screen>
+./configure ... XMLLINT=/opt/local/bin/xmllint ...
+</screen>
+   另外，如果你想确认<filename>xmllint</filename>和<filename>xsltproc</filename>不会执行任何网络访问，你可以如下操作
+<screen>
+./configure ... XMLLINT="xmllint --nonet" XSLTPROC="xsltproc --nonet" ...
 </screen>
-   如果没有找到<filename>xmllint</filename>，那么一些后续测试将被跳过。
   </para>
 
   </sect2>

postgresql/doc/src/sgml/ltree.sgml

@@ -1583,7 +1583,7 @@ ltreetest=> SELECT subpath(path,0,2)||'Space'||subpath(path,2) FROM test WHER
 
 <!--==========================orignal english content==========================
   <para>
-   We could simplify this by creating a SQL function that inserts a label
+   We could simplify this by creating an SQL function that inserts a label
    at a specified position in a path:
 <screen>
 CREATE FUNCTION ins_label(ltree, int, text) RETURNS ltree

postgresql/doc/src/sgml/nls.sgml

@@ -133,7 +133,7 @@ msgstr "another translated"
 
 ...
 </programlisting>
-    The msgid's are extracted from the program source.  (They need not
+    The msgid lines are extracted from the program source.  (They need not
     be, but this is the most common way.)  The msgstr lines are
     initially empty and are filled in with useful strings by the
     translator.  The strings can contain C-style escape characters and
@@ -155,7 +155,7 @@ msgstr "another translated"
 
 ...
 </programlisting>
-    msgid 被从程序源代码中抽取（不是必须这样做，但是这是最常用的方法）。msgstr 行最初是空的并且被翻译者用以填充有用的字符串。字符串可以包含 C 风格的转义字符并且可以跨越行（下一行必须开始于行首）。
+    msgid行被从程序源代码中抽取（不是必须这样做，但是这是最常用的方法）。msgstr 行最初是空的并且被翻译者用以填充有用的字符串。字符串可以包含 C 风格的转义字符并且可以跨越行（下一行必须开始于行首）。
    </para>
 
 <!--==========================orignal english content==========================
@@ -174,7 +174,7 @@ msgstr "another translated"
     The #. style comments are extracted from the source file where the
     message is used.  Possibly the programmer has inserted information
     for the translator, such as about expected alignment.  The #:
-    comment indicates the exact location(s) where the message is used
+    comments indicate the exact locations where the message is used
     in the source.  The translator need not look at the program
     source, but can if there is doubt about the correct
     translation.  The #, comments contain flags that describe the

postgresql/doc/src/sgml/passwordcheck.sgml

@@ -45,7 +45,7 @@ ____________________________________________________________________________-->
  <para>
   You can adapt this module to your needs by changing the source code.
   For example, you can use
-  <ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>
+  <ulink url="https://github.com/cracklib/cracklib">CrackLib</ulink>
   to check passwords &mdash; this only requires uncommenting
   two lines in the <filename>Makefile</filename> and rebuilding the
   module.  (We cannot include <productname>CrackLib</productname>
@@ -56,7 +56,7 @@ ____________________________________________________________________________-->
  </para>
 ____________________________________________________________________________-->
  <para>
-  你可以通过修改源代码来按你的需要修改这个模块。例如，你可以使用<ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块（由于授权原因，我们不能默认包括<productname>CrackLib</productname>）。如果没有<productname>CrackLib</productname>，该模块会对口令强度强制一些简单的规则，你可以自行修改和扩充。
+  你可以通过修改源代码来按你的需要修改这个模块。例如，你可以使用<ulink url="https://github.com/cracklib/cracklib">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块（由于授权原因，我们不能默认包括<productname>CrackLib</productname>）。如果没有<productname>CrackLib</productname>，该模块会对口令强度强制一些简单的规则，你可以自行修改和扩充。
  </para>
 
  <caution>

postgresql/doc/src/sgml/pgbuffercache.sgml

@@ -190,7 +190,7 @@ ____________________________________________________________________________-->
       </para>
       <para>
        Fork number within the relation;  see
-       <filename>include/common/relpath.h</filename>
+       <filename>common/relpath.h</filename>
       </para></entry>
      </row>
 ____________________________________________________________________________-->
@@ -199,7 +199,7 @@ ____________________________________________________________________________-->
        <structfield>relforknumber</structfield> <type>smallint</type>
       </para>
       <para>
-       关系内的分叉数，见<filename>include/common/relpath.h</filename>
+       关系内的分叉数，见<filename>common/relpath.h</filename>
       </para></entry>
      </row>
 

postgresql/doc/src/sgml/pgfreespacemap.sgml

@@ -123,18 +123,6 @@ ____________________________________________________________________________-->
   <para>
    对于索引，被跟踪的是整个没有使用的页面，而不是页面中的空闲空间。因此，这些值可能没有意义，只是表示一个页面是满的还是空的。
   </para>
-
-  <note>
-<!--==========================orignal english content==========================
-   <para>
-    The interface was changed in version 8.4, to reflect the new FSM
-    implementation introduced in the same version.
-   </para>
-____________________________________________________________________________-->
-   <para>
-    在版本 8.4 中接口已被更改，以反映在同一个版本中新引入的 FSM 实现。
-   </para>
-  </note>
  </sect2>
 
  <sect2>

postgresql/doc/src/sgml/pgrowlocks.sgml

@@ -192,12 +192,12 @@ ____________________________________________________________________________-->
    <listitem>
 <!--==========================orignal english content==========================
     <para>
-    If the table as a whole is exclusive-locked by someone else,
-    <function>pgrowlocks</function> will be blocked.
+    If an <literal>ACCESS EXCLUSIVE</literal> lock is taken on the table,
+     <function>pgrowlocks</function> will be blocked.
     </para>
 ____________________________________________________________________________-->
     <para>
-    如果表被其他人整体加上了排他锁，<function>pgrowlocks</function>将被阻塞。
+    如果一个表上持有一个<literal>ACCESS EXCLUSIVE</literal>锁，<function>pgrowlocks</function>将被阻塞。
     </para>
    </listitem>
    <listitem>

postgresql/doc/src/sgml/plperl.sgml

@@ -27,27 +27,27 @@ ____________________________________________________________________________-->
 <!--==========================orignal english content==========================
   <para>
    PL/Perl is a loadable procedural language that enables you to write
-   <productname>PostgreSQL</productname> functions in the
+   <productname>PostgreSQL</productname> functions and procedures in the
    <ulink url="https://www.perl.org">Perl programming language</ulink>.
   </para>
 ____________________________________________________________________________-->
   <para>
    PL/Perl 是一种可载入过程语言，它允许我们用
    <ulink url="https://www.perl.org">Perl 编程语言</ulink>编写
-   <productname>PostgreSQL</productname>函数。
+   <productname>PostgreSQL</productname>函数和存储过程。
   </para>
 
 <!--==========================orignal english content==========================
   <para>
    The main advantage to using PL/Perl is that this allows use,
-   within stored functions, of the manyfold <quote>string
+   within stored functions and procedures, of the manyfold <quote>string
    munging</quote> operators and functions available for Perl.  Parsing
    complex strings might be easier using Perl than it is with the
    string functions and control structures provided in PL/pgSQL.
   </para>
 ____________________________________________________________________________-->
   <para>
-   使用 PL/Perl 的主要优势它允许在存储函数中使用大量 Perl 的
+   使用 PL/Perl 的主要优势它允许在存储函数和存储过程中使用大量 Perl 的
    <quote>串整理</quote>操作符和函数。使用 Perl 解析复杂
    串比使用 PL/pgSQL 中提供的串函数和控制结构要更容易。
   </para>

postgresql/doc/src/sgml/ref/close.sgml

@@ -157,14 +157,14 @@ ____________________________________________________________________________-->
    <productname>PostgreSQL</productname> does not have an explicit
    <command>OPEN</command> cursor statement; a cursor is considered
    open when it is declared.  Use the
-   <xref linkend="sql-declare"/>
+   <link linkend="sql-declare"><command>DECLARE</command></link>
    statement to declare a cursor.
   </para>
 ____________________________________________________________________________-->
   <para>
    <productname>PostgreSQL</productname>没有一个显式的
    <command>OPEN</command>游标语句，一个游标在被声明时
-   就被认为是打开的。使用<xref linkend="sql-declare"/>语句可以声明游标。
+   就被认为是打开的。使用<link linkend="sql-declare"><command>DECLARE</command></link>语句可以声明游标。
   </para>
 
 <!--==========================orignal english content==========================

postgresql/doc/src/sgml/ref/create_aggregate.sgml

@@ -1160,7 +1160,7 @@ ____________________________________________________________________________-->
      <para>
       The meanings of <literal>PARALLEL SAFE</literal>, <literal>PARALLEL
       RESTRICTED</literal>, and <literal>PARALLEL UNSAFE</literal> are the same as
-      in <xref linkend="sql-createfunction"/>.  An aggregate will not be
+      in <link linkend="sql-createfunction"><command>CREATE FUNCTION</command></link>.  An aggregate will not be
       considered for parallelization if it is marked <literal>PARALLEL
       UNSAFE</literal> (which is the default!) or <literal>PARALLEL RESTRICTED</literal>.
       Note that the parallel-safety markings of the aggregate's support
@@ -1171,7 +1171,7 @@ ____________________________________________________________________________-->
      <para>
       <literal>PARALLEL SAFE</literal>、<literal>PARALLEL
       RESTRICTED</literal>和<literal>PARALLEL UNSAFE</literal>的含义和
-      <xref linkend="sql-createfunction"/>中的相同。如果一个聚集被标记为
+      <link linkend="sql-createfunction"><command>CREATE FUNCTION</command></link>中的相同。如果一个聚集被标记为
       <literal>PARALLEL UNSAFE</literal>（默认）或者
       <literal>PARALLEL RESTRICTED</literal>，将不会考虑将它并行化。注意
       规划器不会参考聚集的支持函数的并行安全性标记，它只会考虑聚集本身