update pg_dumpall.sgml to postgres-ref.sgml

Author: chegong18

postgresql/doc/src/sgml/ref/pg_dumpall.sgml

@@ -254,7 +254,9 @@ ____________________________________________________________________________-->
         Specifies verbose mode.  This will cause
         <application>pg_dumpall</application> to output start/stop
         times to the dump file, and progress messages to standard error.
-        It will also enable verbose output in <application>pg_dump</application>.
+        Repeating the option causes additional debug-level messages
+        to appear on standard error.
+        The option is also passed down to <application>pg_dump</application>.
        </para>
       </listitem>
      </varlistentry>
@@ -425,10 +427,7 @@ ____________________________________________________________________________-->
         the dump. Instead, fail if unable to lock a table within the specified
         <replaceable class="parameter">timeout</replaceable>. The timeout may be
         specified in any of the formats accepted by <command>SET
-        statement_timeout</command>.  Allowed values vary depending on the server
-        version you are dumping from, but an integer number of milliseconds
-        is accepted by all versions since 7.3.  This option is ignored when
-        dumping from a pre-7.3 server.
+        statement_timeout</command>.
        </para>
       </listitem>
      </varlistentry>
@@ -511,6 +510,18 @@ ____________________________________________________________________________-->
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-&minus;no-toast-compression</option></term>
+      <listitem>
+       <para>
+        Do not output commands to set <acronym>TOAST</acronym> compression
+        methods.
+        With this option, all columns will be restored with the default
+        compression setting.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-&minus;no-unlogged-table-data</option></term>
       <listitem>
@@ -702,7 +713,9 @@ ____________________________________________________________________________-->
       <term><option>--verbose</option></term>
       <listitem>
        <para>
-        指定细节模式。这将导致<application>pg_dumpall</application>向标准错误输出详细的对象注释以及转储文件的开始/停止时间，还有进度消息。它也会启用<application>pg_dump</application>中的细节输出。
+        指定细节模式。这将导致<application>pg_dumpall</application>向标准错误输出详细的对象注释以及转储文件的开始/停止时间，还有进度消息。
+        重复该选项会导致在标准错误上出现附加的调试级信息。
+        这个选项还会被传递到<application>pg_dump</application>。
        </para>
       </listitem>
      </varlistentry>
@@ -826,7 +839,9 @@ ____________________________________________________________________________-->
       <term><option>--lock-wait-timeout=<replaceable class="parameter">timeout</replaceable></option></term>
       <listitem>
        <para>
-        在转储的开始从不等待共享表锁的获得。而是在指定的<replaceable class="parameter">timeout</replaceable>内不能锁定一个表时失败。超时时长可以用<command>SET statement_timeout</command>接受的任何格式指定（允许的值根据你从其转出的服务器版本变化，但是从 7.3 以来的所有版本都接受一个整数表示的毫秒数。如果从 7.3 以前的服务器转出，这个选项会被忽略。）。
+        在转储的开始从不等待共享表锁的获得。
+        而是在指定的<replaceable class="parameter">timeout</replaceable>内不能锁定一个表时失败。
+        超时时长可以用<command>SET statement_timeout</command>接受的任何格式指定。
        </para>
       </listitem>
      </varlistentry>
@@ -894,6 +909,16 @@ ____________________________________________________________________________-->
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-&minus;no-toast-compression</option></term>
+      <listitem>
+       <para>
+        不要输出命令以设置 <acronym>TOAST</acronym> 压缩方法。
+        采用这个选项，所有列将会以默认压缩设置来恢复。
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-unlogged-table-data</option></term>
       <listitem>
@@ -965,7 +990,7 @@ ____________________________________________________________________________-->
       <listitem>
        <para>
         Specifies parameters used to connect to the server, as a <link
-        linkend="libpq-connstring">connction string</link>;  these
+        linkend="libpq-connstring">connection string</link>;  these
         will override any conflicting command line options.
        </para>
        <para>

postgresql/doc/src/sgml/ref/pg_receivewal.sgml

@@ -12,16 +12,16 @@ ____________________________________________________________________________-->
  <indexterm zone="app-pgreceivewal">
   <primary>pg_receivewal</primary>
  </indexterm>
- 
+
 <!--==========================orignal english content==========================
  <refmeta>
-  <refentrytitle>pg_receivewal</refentrytitle>
+  <refentrytitle><application>pg_receivewal</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
 ____________________________________________________________________________-->
  <refmeta>
-  <refentrytitle>pg_receivewal</refentrytitle>
+  <refentrytitle><application>pg_receivewal</application></refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -82,7 +82,7 @@ ____________________________________________________________________________-->
   <para>
    当预写式日志在服务器上被产生时，<application>pg_receivewal</application>实时以流的方式传输预写式日志，并且不像<xref linkend="guc-archive-command"/>那样等待段完成。由于这个原因，在使用<application>pg_receivewal</application>时不必设置<xref linkend="guc-archive-timeout"/>。
   </para>
-  
+
 <!--==========================orignal english content==========================
   <para>
    Unlike the WAL receiver of a PostgreSQL standby server, <application>pg_receivewal</application>
@@ -125,6 +125,49 @@ ____________________________________________________________________________-->
    预写式日志在一个常规<productname>PostgreSQL</productname>连接上被以流式传送，并且使用复制协议。连接必须由一个具有<literal>REPLICATION</literal>权限（见<xref linkend="role-attributes"/>）的用户或者一个超级用户建立，并且<filename>pg_hba.conf</filename>必须允许复制连接。服务器也必须被配置一个足够高的<xref linkend="guc-max-wal-senders"/>来至少留出一个可用会话给流。
   </para>
 
+<!--==========================orignal english content==========================
+  <para>
+   The starting point of the write-ahead log streaming is calculated when
+   <application>pg_receivewal</application> starts:
+   <orderedlist>
+    <listitem>
+     <para>
+      First, scan the directory where the WAL segment files are written and
+      find the newest completed segment file, using as starting point the
+      beginning of the next WAL segment file. This is calculated independently
+      on the compression method used to compress each segment.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If a starting point cannot be calculated with the previous method,
+      the latest WAL flush location is used as reported by the server from
+      a <literal>IDENTIFY_SYSTEM</literal> command.
+     </para>
+    </listitem>
+   </orderedlist>
+  </para>
+____________________________________________________________________________-->
+  <para>
+   The starting point of the write-ahead log streaming is calculated when
+   <application>pg_receivewal</application> starts:
+   <orderedlist>
+    <listitem>
+     <para>
+      首先，扫描WAL段文件所写入的目录，并发现最新完成的段文件，作为下一个段文件的开始的起始点。
+      这是独立计算的，根据用于压缩每个段的压缩方法。
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      如果用前面的方法无法计算出起点，最新的WAL刷写位置用作由服务器通过<literal>IDENTIFY_SYSTEM</literal>命令的报告。
+     </para>
+    </listitem>
+   </orderedlist>
+  </para>
+
 <!--==========================orignal english content==========================
   <para>
    If the connection is lost, or if it cannot be initially established,
@@ -217,7 +260,7 @@ ____________________________________________________________________________-->
        </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><option>-&minus;if-not-exists</option></term>
@@ -236,7 +279,7 @@ ____________________________________________________________________________-->
        </para>
       </listitem>
      </varlistentry>
-         
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><option>-n</option></term>
@@ -288,7 +331,7 @@ ____________________________________________________________________________-->
        </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
@@ -364,7 +407,7 @@ ____________________________________________________________________________-->
         </para>
       </listitem>
      </varlistentry>
-     
+
      <varlistentry>
 <!--==========================orignal english content==========================
       <term><option>-&minus;synchronous</option></term>
@@ -455,7 +498,7 @@ ____________________________________________________________________________-->
       <listitem>
        <para>
         Specifies parameters used to connect to the server, as a <link
-        linkend="libpq-connstring">connction string</link>;  these
+        linkend="libpq-connstring">connection string</link>;  these
         will override any conflicting command line options.
        </para>
        <para>
@@ -614,7 +657,7 @@ ____________________________________________________________________________-->
      </varlistentry>
     </variablelist>
    </para>
-   
+
 <!--==========================orignal english content==========================
    <para>
     <application>pg_receivewal</application> can perform one of the two

postgresql/doc/src/sgml/ref/pg_resetwal.sgml

@@ -5,14 +5,14 @@ PostgreSQL documentation
 
 <refentry id="app-pgresetwal">
 <!--==========================orignal english content==========================
-  <indexterm zone="app-pgresetwal">
+ <indexterm zone="app-pgresetwal">
   <primary>pg_resetwal</primary>
  </indexterm>
 ____________________________________________________________________________-->
-  <indexterm zone="app-pgresetwal">
+ <indexterm zone="app-pgresetwal">
   <primary>pg_resetwal</primary>
  </indexterm>
- 
+
 <!--==========================orignal english content==========================
  <refmeta>
   <refentrytitle><application>pg_resetwal</application></refentrytitle>
@@ -42,40 +42,40 @@ ____________________________________________________________________________-->
   <cmdsynopsis>
    <command>pg_resetwal</command>
    <group choice="opt">
-    <arg choice="plain"><option>-&minus;force</option></arg>
     <arg choice="plain"><option>-f</option></arg>
+    <arg choice="plain"><option>-&minus;force</option></arg>
    </group>
    <group choice="opt">
-    <arg choice="plain"><option>-&minus;dry-run</option></arg>
     <arg choice="plain"><option>-n</option></arg>
+    <arg choice="plain"><option>-&minus;dry-run</option></arg>
    </group>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
    <group choice="plain">
     <group choice="opt">
-     <arg choice="plain"><option>-&minus;pgdata</option></arg>
      <arg choice="plain"><option>-D</option></arg>
+     <arg choice="plain"><option>-&minus;pgdata</option></arg>
     </group>
-    <replaceable class="parameter"> datadir</replaceable>
+    <replaceable class="parameter">datadir</replaceable>
    </group>
   </cmdsynopsis>
 ____________________________________________________________________________-->
   <cmdsynopsis>
    <command>pg_resetwal</command>
    <group choice="opt">
-    <arg choice="plain"><option>--force</option></arg>
     <arg choice="plain"><option>-f</option></arg>
+    <arg choice="plain"><option>--force</option></arg>
    </group>
    <group choice="opt">
-    <arg choice="plain"><option>--dry-run</option></arg>
     <arg choice="plain"><option>-n</option></arg>
+    <arg choice="plain"><option>--dry-run</option></arg>
    </group>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
    <group choice="plain">
     <group choice="opt">
-     <arg choice="plain"><option>--pgdata</option></arg>
      <arg choice="plain"><option>-D</option></arg>
+     <arg choice="plain"><option>--pgdata</option></arg>
     </group>
-    <replaceable class="parameter"> datadir</replaceable>
+    <replaceable class="parameter">datadir</replaceable>
    </group>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -237,7 +237,7 @@ ____________________________________________________________________________-->
 <para>显示帮助然后退出。</para></listitem>
    </varlistentry>
   </variablelist>
-  
+
 <!--==========================orignal english content==========================
   <para>
    The following options are only needed when
@@ -532,6 +532,45 @@ ____________________________________________________________________________-->
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+<!--==========================orignal english content==========================
+    <term><option>-u <replaceable class="parameter">xid</replaceable></option></term>
+____________________________________________________________________________-->
+    <term><option>-u <replaceable class="parameter">xid</replaceable></option></term>
+<!--==========================orignal english content==========================
+    <term><option>-&minus;oldest-transaction-id=<replaceable class="parameter">xid</replaceable></option></term>
+____________________________________________________________________________-->
+    <term><option>--oldest-transaction-id=<replaceable class="parameter">xid</replaceable></option></term>
+    <listitem>
+<!--==========================orignal english content==========================
+     <para>
+      Manually set the oldest unfrozen transaction ID.
+     </para>
+____________________________________________________________________________-->
+     <para>
+      手工设置最老的未冻结事务ID。
+     </para>
+
+<!--==========================orignal english content==========================
+     <para>
+      A safe value can be determined by looking for the numerically smallest
+      file name in the directory <filename>pg_xact</filename> under the data directory
+      and then multiplying by 1048576 (0x100000).  Note that the file names are in
+      hexadecimal.  It is usually easiest to specify the option value in
+      hexadecimal too. For example, if <filename>0007</filename> is the smallest entry
+      in <filename>pg_xact</filename>, <literal>-u 0x700000</literal> will work (five
+      trailing zeroes provide the proper multiplier).
+     </para>
+____________________________________________________________________________-->
+     <para>
+      一个安全值，可以通过在数据目录下的<filename>pg_xact</filename>目录中查找数字最小的文件名然后乘以1048576 (0x100000)的方式来确定。
+      注意该文件名是十六进制的。
+      以十六进制来指定选项值通常也是最简单的。
+      例如,如果<filename>0007</filename>是<filename>pg_xact</filename>中最小的记录，<literal>-u 0x700000</literal>将有效(五个后补零提供适当的乘数)。
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
 <!--==========================orignal english content==========================
     <term><option>-x <replaceable class="parameter">xid</replaceable></option></term>
@@ -576,7 +615,7 @@ ____________________________________________________________________________-->
   <title>Environment</title>
 ____________________________________________________________________________-->
   <title>Environment</title>
-  
+
   <variablelist>
    <varlistentry>
 <!--==========================orignal english content==========================