from ref/rollback_prepared.sgml to ref/vacuumdb.sgml

Author: oneofsunshine

postgresql/doc/src/sgml/ref/rollback_prepared.sgml

@@ -136,9 +136,9 @@ ____________________________________________________________________________-->
 
  <refsect1 id="sql-rollback-prepared-examples">
 <!--==========================orignal english content==========================
-  <title id="sql-rollback-prepared-examples-title">Examples</title>
+  <title>Examples</title>
 ____________________________________________________________________________-->
-  <title id="sql-rollback-prepared-examples-title">例子</title>
+  <title>例子</title>
 <!--==========================orignal english content==========================
   <para>
    Roll back the transaction identified by the transaction

postgresql/doc/src/sgml/ref/select.sgml

@@ -47,7 +47,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
     [ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
     [ WHERE <replaceable class="parameter">condition</replaceable> ]
     [ GROUP BY <replaceable class="parameter">expression</replaceable> [, ...] ]
-    [ HAVING <replaceable class="parameter">condition</replaceable> [, ...] ]
+    [ HAVING <replaceable class="parameter">condition</replaceable> ]
     [ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...] ]
     [ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] <replaceable class="parameter">select</replaceable> ]
     [ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [ NULLS { FIRST | LAST } ] [, ...] ]
@@ -65,7 +65,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
     [ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
     [ WHERE <replaceable class="parameter">condition</replaceable> ]
     [ GROUP BY <replaceable class="parameter">expression</replaceable> [, ...] ]
-    [ HAVING <replaceable class="parameter">condition</replaceable> [, ...] ]
+    [ HAVING <replaceable class="parameter">condition</replaceable> ]
     [ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...] ]
     [ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] <replaceable class="parameter">select</replaceable> ]
     [ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [ NULLS { FIRST | LAST } ] [, ...] ]

postgresql/doc/src/sgml/ref/select_into.sgml

@@ -1,4 +1,8 @@
-<!-- doc/src/sgml/ref/set_constraints.sgml -->
+<!--
+doc/src/sgml/ref/set_constraints.sgml
+PostgreSQL documentation
+-->
+
 <refentry id="sql-set-constraints">
 <!--==========================orignal english content==========================
  <indexterm zone="sql-set-constraints">

postgresql/doc/src/sgml/ref/set_constraints.sgml

@@ -1,4 +1,8 @@
-<!-- doc/src/sgml/ref/set_session_auth.sgml -->
+<!--
+doc/src/sgml/ref/set_session_auth.sgml
+PostgreSQL documentation
+-->
+
 <refentry id="sql-set-session-authorization">
 <!--==========================orignal english content==========================
  <indexterm zone="sql-set-session-authorization">

postgresql/doc/src/sgml/ref/set_session_auth.sgml

@@ -1,4 +1,8 @@
-<!-- doc/src/sgml/ref/set_transaction.sgml -->
+<!--
+doc/src/sgml/ref/set_transaction.sgml
+PostgreSQL documentation
+-->
+
 <refentry id="sql-set-transaction">
 <!--==========================orignal english content==========================
  <indexterm zone="sql-set-transaction">

postgresql/doc/src/sgml/ref/set_transaction.sgml

@@ -296,8 +296,7 @@ ____________________________________________________________________________-->
    When <literal>RESTART IDENTITY</literal> is specified, the implied
    <command>ALTER SEQUENCE RESTART</command> operations are also done
    transactionally; that is, they will be rolled back if the surrounding
-   transaction does not commit.  This is unlike the normal behavior of
-   <command>ALTER SEQUENCE RESTART</command>.  Be aware that if any additional
+   transaction does not commit.  Be aware that if any additional
    sequence operations are done on the restarted sequences before the
    transaction rolls back, the effects of these operations on the sequences
    will be rolled back, but not their effects on <function>currval()</function>;
@@ -311,8 +310,7 @@ ____________________________________________________________________________-->
   <para>
    在指定了<literal>RESTART IDENTITY</literal>时，隐含的
    <command>ALTER SEQUENCE RESTART</command>操作也会被事务性地完成。
-   也就是说，如果所在事务没有提交，它们也将被回滚。这和
-   <command>ALTER SEQUENCE RESTART</command>的通常行为不同。注意如果
+   也就是说，如果所在事务没有提交，它们也将被回滚。注意如果
    事务回滚前在被重启序列上还做了额外的序列操作，这些操作在序列上的效果
    也将被回滚，但是它们在<function>currval()</function>上的效果不会被回滚。也就
    是说，在事务之后，<function>currval()</function>将继续反映在失败事务内得到的

postgresql/doc/src/sgml/ref/truncate.sgml

@@ -46,7 +46,7 @@ UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [
           ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) |
           ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> )
         } [, ...]
-    [ FROM <replaceable class="parameter">from_list</replaceable> ]
+    [ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
     [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
@@ -58,7 +58,7 @@ UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [
           ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) |
           ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> )
         } [, ...]
-    [ FROM <replaceable class="parameter">from_list</replaceable> ]
+    [ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
     [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
@@ -268,13 +268,17 @@ ____________________________________________________________________________-->
     <listitem>
 <!--==========================orignal english content==========================
      <para>
-      Set the column to its default value (which will be NULL if no
-      specific default expression has been assigned to it).
+      Set the column to its default value (which will be NULL if no specific
+      default expression has been assigned to it).  An identity column will be
+      set to a new value generated by the associated sequence.  For a
+      generated column, specifying this is permitted but merely specifies the
+      normal behavior of computing the column from its generation expression.
      </para>
 ____________________________________________________________________________-->
      <para>
       将该列设置为它的默认值（如果没有为它指定默认值表达式，默认值
-      将会为 NULL）。
+      将会为 NULL）。标识列将设置为关联序列生成的新值。
+      对于生成的列，允许指定此项，但仅指定从其生成表达式计算列的正常行为。
      </para>
     </listitem>
    </varlistentry>
@@ -307,29 +311,28 @@ ____________________________________________________________________________-->
 
    <varlistentry>
 <!--==========================orignal english content==========================
-    <term><replaceable class="parameter">from_list</replaceable></term>
+    <term><replaceable class="parameter">from_item</replaceable></term>
 ____________________________________________________________________________-->
-    <term><replaceable class="parameter">from_list</replaceable></term>
+    <term><replaceable class="parameter">from_item</replaceable></term>
     <listitem>
 <!--==========================orignal english content==========================
      <para>
-      A list of table expressions, allowing columns from other tables
-      to appear in the <literal>WHERE</literal> condition and the update
-      expressions. This is similar to the list of tables that can be
-      specified in the <xref linkend="sql-from"
-      endterm="sql-from-title"/> of a <command>SELECT</command>
-      statement.  Note that the target table must not appear in the
-      <replaceable>from_list</replaceable>, unless you intend a self-join (in which
-      case it must appear with an alias in the <replaceable>from_list</replaceable>).
+      A table expression allowing columns from other tables to appear in
+      the <literal>WHERE</literal> condition and update expressions. This
+      uses the same syntax as the <link
+      linkend="sql-from"><literal>FROM</literal></link> clause of
+      a <command>SELECT</command> statement;
+      for example, an alias for the table name can be specified.  Do not
+      repeat the target table as a <replaceable>from_item</replaceable>
+      unless you intend a self-join (in which case it must appear with
+      an alias in the <replaceable>from_item</replaceable>).
      </para>
 ____________________________________________________________________________-->
      <para>
-      表表达式的列表，允许来自其他表的列出现在<literal>WHERE</literal>
-      条件和更新表达式中。这类似于可以在
-      <command>SELECT</command>语句的<xref linkend="sql-from"
-      endterm="sql-from-title"/>中指定的表列表。注意目标表不能出现在
-      <replaceable>from_list</replaceable>中，除非你想做自连接（这种情况下它必须
-      以别名出现在<replaceable>from_list</replaceable>中）。
+      表表达式允许来自其他表的列出现在<literal>WHERE</literal>条件和更新表达式中。这使用与
+      <command>SELECT</command>语句的<link linkend="sql-from"><literal>FROM</literal></link>
+      子句相同的语法；例如，可以指定表名的别名。不要将目标表作为<replaceable>from_list</replaceable>
+      重复，除非你想做自连接（这种情况下它必须以别名出现在<replaceable>from_list</replaceable>中）。
      </para>
     </listitem>
    </varlistentry>
@@ -491,7 +494,7 @@ ____________________________________________________________________________-->
   <para>
    When a <literal>FROM</literal> clause is present, what essentially happens
    is that the target table is joined to the tables mentioned in the
-   <replaceable>from_list</replaceable>, and each output row of the join
+   <replaceable>from_item</replaceable> list, and each output row of the join
    represents an update operation for the target table.  When using
    <literal>FROM</literal> you should ensure that the join
    produces at most one output row for each row to be modified.  In
@@ -503,7 +506,7 @@ ____________________________________________________________________________-->
 ____________________________________________________________________________-->
   <para>
    当存在<literal>FROM</literal>子句时，实际发生的是：目标表被连接到
-   <replaceable>from_list</replaceable>中的表，并且该连接的每一
+   <replaceable>from_item</replaceable>列表中的表，并且该连接的每一
    个输出行表示对目标表的一个更新操作。在使用<literal>FROM</literal>
    时，你应该确保该连接对每一个要修改的行产生至多一个输出行。换
    句话说，一个目标行不应该连接到来自其他表的多于一行上。如果发