修正编译错误

ChenHuajun · ChenHuajun · commit 57165ec35f76 · 2016-04-26T23:39:15.000+08:00
diff --git a/postgresql/doc/src/sgml/catalogs.sgml b/postgresql/doc/src/sgml/catalogs.sgml
@@ -4737,10 +4737,8 @@
   </para>
 -->
 <para>
-<structname>pg_event_trigger</structname>表存储时间触发器。参阅<xref linkend="event-
-
-triggers">
-获取详细信息。
+<structname>pg_event_trigger</structname>表存储时间触发器。
+参阅<xref linkend="event-triggers">获取详细信息。
 </para>
 
   <table>
diff --git a/postgresql/doc/src/sgml/client-auth.sgml b/postgresql/doc/src/sgml/client-auth.sgml
@@ -730,10 +730,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
 </para>
         </listitem>
        </varlistentry>
-
-        </listitem>
-       </varlistentry>
-
+       
        <varlistentry>
         <term><literal>ident</></term>
         <listitem>
diff --git a/postgresql/doc/src/sgml/datatype.sgml b/postgresql/doc/src/sgml/datatype.sgml
@@ -1366,7 +1366,6 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
 </para>
     </note>
 
-    <note>
      <!--
 <para>
      To insert the next value of the sequence into the <type>serial</type>
diff --git a/postgresql/doc/src/sgml/func.sgml b/postgresql/doc/src/sgml/func.sgml
@@ -15078,7 +15078,6 @@ table2-mapping
        </entry>
       </row>
       <row>
-       <entry>
        <entry><para><literal>json_populate_record(base anyelement, from_json json)</literal>
          </para><para><literal>jsonb_populate_record(base anyelement, from_json jsonb)</literal>
        </para></entry>
@@ -24416,14 +24415,12 @@ WAL生成的速度和可用的磁盘空间。
     relation.  The second argument can be provided to specify which fork
     to examine:
 -->
-<para>
 <function>pg_relation_size</>接受一个表、索引、压缩表的 OID 或者名字，
 然后返回该关系的一个分支以字节计的磁盘大小。（请注意，
 对于大多数场合，使用高级函数<function>pg_total_relation_size</>
 或<function>pg_table_size</>更加方便，它们统计所有分支的总和。）
 带有一个参数，它返回该关系的主数据分支的大小。
 可以提供第二个参数声明检测那个分支：
-</para>
 
     <itemizedlist spacing="compact">
      <listitem>
diff --git a/postgresql/doc/src/sgml/libpq.sgml b/postgresql/doc/src/sgml/libpq.sgml
@@ -10411,7 +10411,7 @@ TCP（主机名<literal>localhost</>）和Unix域套接字（<literal>pghost</>
    at <filename>~/.pg_service.conf</filename> or the location
    specified by the environment variable <envar>PGSERVICEFILE</envar>,
    or it can be a system-wide file
-   at <filename>`pg_config --sysconfdir`/pg_service.conf</filename> or in the directory
+   at <filename>`pg_config &minus;-sysconfdir`/pg_service.conf</filename> or in the directory
    specified by the environment variable
    <envar>PGSYSCONFDIR</envar>.  If service definitions with the same
    name exist in the user and the system file, the user file takes
diff --git a/postgresql/doc/src/sgml/ref/alter_extension.sgml b/postgresql/doc/src/sgml/ref/alter_extension.sgml
@@ -229,9 +229,6 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
       </para>
      </listitem>
     </varlistentry>
-      </para>
-     </listitem>
-    </varlistentry>
 
     <varlistentry>
      <term><replaceable>source_type</replaceable></term>
diff --git a/postgresql/doc/src/sgml/ref/alter_index.sgml b/postgresql/doc/src/sgml/ref/alter_index.sgml
@@ -156,7 +156,6 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
 
   </variablelist>
   </para>
-  </para>
 
 
  </refsect1>
diff --git a/postgresql/doc/src/sgml/ref/create_aggregate.sgml b/postgresql/doc/src/sgml/ref/create_aggregate.sgml
@@ -147,8 +147,8 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
    <replaceable class="PARAMETER">ffunc</replaceable>.
    These are used as follows:
 <programlisting>
-<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state
-<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) ---> aggregate-value
+<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) &minus;&minus;-> next-internal-state
+<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) &minus;&minus;-> aggregate-value
 </programlisting>
   </para>
 -->
diff --git a/postgresql/doc/src/sgml/ref/create_view.sgml b/postgresql/doc/src/sgml/ref/create_view.sgml
@@ -239,7 +239,9 @@ CREATE VIEW <replaceable>name</> AS WITH RECURSIVE <replaceable>name</> (<replac
        </varlistentry>
       </variablelist>
      </para>
-
+    </listitem>
+   </varlistentry>
+   
    <varlistentry>
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
diff --git a/postgresql/doc/src/sgml/ref/createuser.sgml b/postgresql/doc/src/sgml/ref/createuser.sgml
@@ -198,6 +198,8 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
+
+     <varlistentry>
       <term><option>-g <replaceable class="parameter">role</replaceable></></term>
       <term><option>--role=<replaceable class="parameter">role</replaceable></></term>
       <listitem>
@@ -216,7 +218,6 @@ PostgreSQL documentation
          </listitem>
      </varlistentry>
 
-     <varlistentry>
      <varlistentry>
       <term><option>-i</></term>
       <term><option>--inherit</></term>
diff --git a/postgresql/doc/src/sgml/release-9.0.sgml b/postgresql/doc/src/sgml/release-9.0.sgml
@@ -4450,6 +4450,7 @@ WAL更新可能会应用到错误的页面，超出它应该做的好多页面
 </para>
     </listitem>
 
+    <listitem>
 <!-- 
      <para>
       Fix <application>pg_dumpall</> to work when a source database
diff --git a/postgresql/doc/src/sgml/release-9.3.sgml b/postgresql/doc/src/sgml/release-9.3.sgml
@@ -1048,9 +1048,10 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
       or <command>DELETE</> (Etsuro Fujita)
      </para>
 -->
-在<literal>READ COMMITTED</>检查发生在在<command>SELECT FOR UPDATE</>、
+<para>
+当<literal>READ COMMITTED</>再检查发生在<command>SELECT FOR UPDATE</>、
 <command>UPDATE</>或<command>DELETE</>中锁定了行之后时，
-确保正确的报告外表的<structfield>tableoid</> (Etsuro Fujita)
+确保正确的报告外部表的<structfield>tableoid</> (Etsuro Fujita)
 </para>
     </listitem>
 
@@ -3661,6 +3662,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
       being archived again when the standby is promoted (Andres Freund)
      </para>
 -->
+<para>
 阻止提升备用服务器时，<literal>pg_basebackup -x/-X</>
 创建的WAL文件被再次归档 (Andres Freund)
 </para>
diff --git a/postgresql/doc/src/sgml/runtime.sgml b/postgresql/doc/src/sgml/runtime.sgml
@@ -1668,10 +1668,11 @@ To set a new value for <varname>SHMMAX</>, run:
       <!-- 
   <term><systemitem class="osname">Solaris</> 2.6 to 2.9 (Solaris
       6 to Solaris 9)
-      <indexterm><primary>Solaris</><secondary>IPC configuration</></> 
+      <indexterm><primary>Solaris</><secondary>IPC configuration</></>
+  </term>  
   -->
   <term><systemitem class="osname">Solaris</> 2.6 到 2.9 (Solaris
-      6 到 Solaris 9)</term>
+      6 到 Solaris 9)
       <indexterm><primary>Solaris</><secondary>IPC 配置</></>
       </term>
       <listitem>
diff --git a/postgresql/doc/src/sgml/syntax.sgml b/postgresql/doc/src/sgml/syntax.sgml
@@ -248,7 +248,7 @@ There is a second kind of identifier:  the <firstterm>delimited
     identifier</firstterm> or <firstterm>quoted
     identifier</firstterm>.  It is formed by enclosing an arbitrary
     sequence of characters in double-quotes
-    (<literal>"</literal>). <!-- " font-lock mania --> A delimited
+    (<literal>"</literal>). --><!-- " font-lock mania --><!-- A delimited
     identifier is always an identifier, never a key word.  So
     <literal>"select"</literal> could be used to refer to a column or
     table named <quote>select</quote>, whereas an unquoted

-Original file line number
+Diff line change
 </para>
     </note>
 -    <note>
      <!--
 <para>
      To insert the next value of the sequence into the <type>serial</type>