1. 合并彭老翻译的PG11.0

2. 升级11.0到11.2
3. 部分编译错误修改

Author: ChenHuajun

postgresql/doc/src/sgml/acronyms.sgml

@@ -17,38 +17,40 @@ ____________________________________________________________________________-->
 
 <!--==========================orignal english content==========================
  <para>
-  <filename>adminpack</> provides a number of support functions which
-  <application>pgAdmin</> and other administration and management tools can
+  <filename>adminpack</filename> provides a number of support functions which
+  <application>pgAdmin</application> and other administration and management tools can
   use to provide additional functionality, such as remote management
   of server log files.
-  Use of all these functions is restricted to superusers.
+  Use of all these functions is only allowed to the superuser by default but may be
+  allowed to other users by using the <command>GRANT</command> command.
  </para>
 ____________________________________________________________________________-->
  <para>
-  <filename>adminpack</filename>提供了一些支持函数，<application>pgAdmin</application>和其他管理工具会用这些函数来提供额外的功能，例如服务器日志文件的远程管理。只有超级用户才能使用全部这些函数。
+  <filename>adminpack</filename> 提供了一些支持函数，<application>pgAdmin</application> 和其他管理工具会用这些函数来提供额外的功能，例如服务器日志文件的远程管理。所有这些函数默认只允许由超级用户使用，但是可以通过使用 <command>GRANT</command> 命令允许其他用户使用。
  </para>
 
 <!--==========================orignal english content==========================
  <para>
-  The functions shown in <xref linkend="functions-adminpack-table"> provide
+  The functions shown in <xref linkend="functions-adminpack-table"/> provide
   write access to files on the machine hosting the server.  (See also the
-  functions in <xref linkend="functions-admin-genfile-table">, which
+  functions in <xref linkend="functions-admin-genfile-table"/>, which
   provide read-only access.)
-  Only files within the database cluster directory can be accessed, but
-  either a relative or absolute path is allowable.
+  Only files within the database cluster directory can be accessed, unless the
+  user is a superuser or given one of the pg_read_server_files, or pg_write_server_files
+  roles, as appropriate for the function, but either a relative or absolute path is
+  allowable.
  </para>
 ____________________________________________________________________________-->
  <para>
   <xref linkend="functions-adminpack-table"/>中展示的函数提供了向运行
   着服务器的机器上的文件进行写入的途径（另见
   <xref linkend="functions-admin-genfile-table"/>中的函数，它们提供了
-  只读的访问途径）。只有位于数据库集簇目录中的文件才能被访问，不过相对
-  路径和绝对路径都可以使用。
+  只读的访问途径）。对于这些函数，只有位于数据库集簇目录中的文件才能被访问（除非用户是一个超级用户或者被指定了 pg_read_server_files 或者 pg_write_server_files 角色之一），不过允许使用相对路径和绝对路径。
  </para>
 
  <table id="functions-adminpack-table">
 <!--==========================orignal english content==========================
-  <title><filename>adminpack</> Functions</title>
+  <title><filename>adminpack</filename> Functions</title>
 ____________________________________________________________________________-->
   <title><filename>adminpack</filename> 函数</title>
   <tgroup cols="3">
@@ -115,15 +117,15 @@ ____________________________________________________________________________-->
      <entry><function>pg_catalog.pg_logdir_ls()</function></entry>
      <entry><type>setof record</type></entry>
      <entry>
-      List the log files in the <varname>log_directory</> directory
+      List the log files in the <varname>log_directory</varname> directory
      </entry>
     </row>
 ____________________________________________________________________________-->
     <row>
      <entry><function>pg_catalog.pg_logdir_ls()</function></entry>
      <entry><type>setof record</type></entry>
      <entry>
-      列出在<varname>log_directory</varname>目录中的日志文件
+      列出在 <varname>log_directory</varname> 目录中的日志文件
      </entry>
     </row>
    </tbody>
@@ -140,17 +142,15 @@ ____________________________________________________________________________-->
  </indexterm>
 <!--==========================orignal english content==========================
  <para>
-  <function>pg_file_write</> writes the specified <parameter>data</> into
-  the file named by <parameter>filename</>.  If <parameter>append</> is
-  false, the file must not already exist.  If <parameter>append</> is true,
+  <function>pg_file_write</function> writes the specified <parameter>data</parameter> into
+  the file named by <parameter>filename</parameter>.  If <parameter>append</parameter> is
+  false, the file must not already exist.  If <parameter>append</parameter> is true,
   the file can already exist, and will be appended to if so.
   Returns the number of bytes written.
  </para>
 ____________________________________________________________________________-->
  <para>
-  <function>pg_file_write</function>把指定的<parameter>data</parameter>写入到由
-  <parameter>filename</parameter>命名的文件中。如果<parameter>append</parameter>
-  为假，文件不能已经存在。如果<parameter>append</parameter>为真，该文件
+  <function>pg_file_write</function> 把指定的 <parameter>data</parameter> 写入到由 <parameter>filename</parameter> 命名的文件中。如果 <parameter>append</parameter> 为假，文件不能已经存在。如果 <parameter>append</parameter> 为真，该文件
   可能已经存在，并且如果存在就会被追加。这个函数返回写入的字节数。
  </para>
 
@@ -164,15 +164,15 @@ ____________________________________________________________________________-->
  </indexterm>
 <!--==========================orignal english content==========================
  <para>
-  <function>pg_file_rename</> renames a file.  If <parameter>archivename</>
-  is omitted or NULL, it simply renames <parameter>oldname</>
-  to <parameter>newname</> (which must not already exist).
-  If <parameter>archivename</> is provided, it first
-  renames <parameter>newname</> to <parameter>archivename</> (which must
-  not already exist), and then renames <parameter>oldname</>
-  to <parameter>newname</>.  In event of failure of the second rename step,
-  it will try to rename <parameter>archivename</> back
-  to <parameter>newname</> before reporting the error.
+  <function>pg_file_rename</function> renames a file.  If <parameter>archivename</parameter>
+  is omitted or NULL, it simply renames <parameter>oldname</parameter>
+  to <parameter>newname</parameter> (which must not already exist).
+  If <parameter>archivename</parameter> is provided, it first
+  renames <parameter>newname</parameter> to <parameter>archivename</parameter> (which must
+  not already exist), and then renames <parameter>oldname</parameter>
+  to <parameter>newname</parameter>.  In event of failure of the second rename step,
+  it will try to rename <parameter>archivename</parameter> back
+  to <parameter>newname</parameter> before reporting the error.
   Returns true on success, false if the source file(s) are not present or
   not writable; other cases throw errors.
  </para>
@@ -200,9 +200,9 @@ ____________________________________________________________________________-->
  </indexterm>
 <!--==========================orignal english content==========================
  <para>
-  <function>pg_file_unlink</> removes the specified file.
+  <function>pg_file_unlink</function> removes the specified file.
   Returns true on success, false if the specified file is not present
-  or the <function>unlink()</> call fails; other cases throw errors.
+  or the <function>unlink()</function> call fails; other cases throw errors.
  </para>
 ____________________________________________________________________________-->
  <para>
@@ -221,10 +221,10 @@ ____________________________________________________________________________-->
  </indexterm>
 <!--==========================orignal english content==========================
  <para>
-  <function>pg_logdir_ls</> returns the start timestamps and path
-  names of all the log files in the <xref linkend="guc-log-directory">
-  directory.  The <xref linkend="guc-log-filename"> parameter must have its
-  default setting (<literal>postgresql-%Y-%m-%d_%H%M%S.log</>) to use this
+  <function>pg_logdir_ls</function> returns the start timestamps and path
+  names of all the log files in the <xref linkend="guc-log-directory"/>
+  directory.  The <xref linkend="guc-log-filename"/> parameter must have its
+  default setting (<literal>postgresql-%Y-%m-%d_%H%M%S.log</literal>) to use this
   function.
  </para>
 ____________________________________________________________________________-->
@@ -235,98 +235,4 @@ ____________________________________________________________________________-->
   <literal>postgresql-%Y-%m-%d_%H%M%S.log</literal>）。
  </para>
 
-<!--==========================orignal english content==========================
- <para>
-  The functions shown
-  in <xref linkend="functions-adminpack-deprecated-table"> are deprecated
-  and should not be used in new applications; instead use those shown
-  in <xref linkend="functions-admin-signal-table">
-  and <xref linkend="functions-admin-genfile-table">.  These functions are
-  provided in <filename>adminpack</> only for compatibility with old
-  versions of <application>pgAdmin</>.
- </para>
-____________________________________________________________________________-->
- <para>
-  The functions shown
-  in 
-  <xref linkend="functions-adminpack-deprecated-table"/>中展示的函数
-  已经被废弃，新的应用不应该使用它们，而是使用
-  <xref linkend="functions-admin-signal-table"/>和
-  <xref linkend="functions-admin-genfile-table"/>中所示的那些函数。在
-  <filename>adminpack</filename>中提供这些函数只是为了兼容旧版本的
-  <application>pgAdmin</application>。
- </para>
-
- <table id="functions-adminpack-deprecated-table">
-<!--==========================orignal english content==========================
-  <title>Deprecated <filename>adminpack</> Functions</title>
-____________________________________________________________________________-->
-  <title>废弃的 <filename>adminpack</filename> 函数</title>
-  <tgroup cols="3">
-   <thead>
-<!--==========================orignal english content==========================
-    <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry>
-    </row>
-____________________________________________________________________________-->
-    <row><entry>名称</entry> <entry>返回类型</entry> <entry>描述</entry>
-    </row>
-   </thead>
-
-   <tbody>
-<!--==========================orignal english content==========================
-    <row>
-     <entry><function>pg_catalog.pg_file_read(filename text, offset bigint, nbytes bigint)</function></entry>
-     <entry><type>text</type></entry>
-     <entry>
-      Alternate name for <function>pg_read_file()</>
-     </entry>
-    </row>
-____________________________________________________________________________-->
-    <row>
-     <entry><function>pg_catalog.pg_file_read(filename text, offset bigint, nbytes bigint)</function></entry>
-     <entry><type>text</type></entry>
-     <entry>
-      <function>pg_read_file()</function>的另一个名字
-     </entry>
-    </row>
-<!--==========================orignal english content==========================
-    <row>
-     <entry><function>pg_catalog.pg_file_length(filename text)</function></entry>
-     <entry><type>bigint</type></entry>
-     <entry>
-      Same as <structfield>size</> column returned
-      by <function>pg_stat_file()</>
-     </entry>
-    </row>
-____________________________________________________________________________-->
-    <row>
-     <entry><function>pg_catalog.pg_file_length(filename text)</function></entry>
-     <entry><type>bigint</type></entry>
-     <entry>
-      和<function>pg_stat_file()</function>返回的<structfield>size</structfield>列一样
-     </entry>
-    </row>
-<!--==========================orignal english content==========================
-    <row>
-     <entry><function>pg_catalog.pg_logfile_rotate()</function></entry>
-     <entry><type>integer</type></entry>
-     <entry>
-      Alternate name for <function>pg_rotate_logfile()</>, but note that it
-      returns integer 0 or 1 rather than <type>boolean</type>
-     </entry>
-    </row>
-____________________________________________________________________________-->
-    <row>
-     <entry><function>pg_catalog.pg_logfile_rotate()</function></entry>
-     <entry><type>integer</type></entry>
-     <entry>
-      Alternate name for 
-      <function>pg_rotate_logfile()</function>的另一个名字，但是要注意它返回
-      整数 0 或者 1 而不是<type>boolean</type>
-     </entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-
 </sect1>