fix编译错误

Author: ChenHuajun

postgresql/doc/src/sgml/array.sgml

@@ -1237,14 +1237,16 @@ SELECT * FROM sal_emp WHERE pay_by_quarter && ARRAY[10000];
 
 <programlisting>
 SELECT array_position(ARRAY['sun','mon','tue','wed','thu','fri','sat'], 'mon');
- array_positions
--&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-
- 2
+ array_position
+-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;
+              2
+(1 row)
 
 SELECT array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);
  array_positions
 -&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-
  {1,4,8}
+(1 row)
 </programlisting>
  </para>
 ____________________________________________________________________________-->

postgresql/doc/src/sgml/config.sgml

@@ -11986,6 +11986,8 @@ CREATE TABLE postgres_log
 <programlisting>
 COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 </programlisting>
+        It is also possible to access the file as a foreign table, using
+        the supplied <xref linkend="file-fdw"/> module.
        </para>
 ____________________________________________________________________________-->
        <para>

postgresql/doc/src/sgml/ddl.sgml

@@ -552,6 +552,8 @@ ____________________________________________________________________________-->
         defined to be a generated column or not.
        </para>
       </listitem>
+     </itemizedlist>
+    </listitem>
    </itemizedlist>
   </para>
 ____________________________________________________________________________-->
@@ -8124,7 +8126,7 @@ SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
 SET enable_partition_pruning = off;
 EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
                                     QUERY PLAN
--&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-
+-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&zwsp;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;
  Aggregate  (cost=188.76..188.77 rows=1 width=8)
    -&gt;  Append  (cost=0.00..181.05 rows=3085 width=0)
          -&gt;  Seq Scan on measurement_y2006m02  (cost=0.00..33.12 rows=617 width=0)

postgresql/doc/src/sgml/dml.sgml

@@ -463,7 +463,7 @@ DELETE FROM products;
 
  <sect1 id="dml-returning">
 <!--==========================orignal english content==========================
-  <title>Returning Data From Modified Rows</title>
+  <title>Returning Data from Modified Rows</title>
 ____________________________________________________________________________-->
   <title>从修改的行中返回数据</title>
 

postgresql/doc/src/sgml/ecpg.sgml

@@ -14690,7 +14690,6 @@ ____________________________________________________________________________-->
 EXEC SQL WHENEVER NOT FOUND CONTINUE;
 EXEC SQL WHENEVER NOT FOUND DO BREAK;
 EXEC SQL WHENEVER NOT FOUND DO CONTINUE;
-EXEC SQL WHENEVER NOT FOUND DO CONTINUE;
 EXEC SQL WHENEVER SQLWARNING SQLPRINT;
 EXEC SQL WHENEVER SQLWARNING DO warn();
 EXEC SQL WHENEVER SQLERROR sqlprint;

postgresql/doc/src/sgml/glossary.sgml

@@ -466,7 +466,7 @@ ____________________________________________________________________________-->
     </para>
 ____________________________________________________________________________-->
     <para>
-     通过<glossterm linkend="glossary-connection">connecting</glossterm>到<glossterm linkend="glossary-instance">instance</glossterm与<glossterm linkend="glossary-database">database</glossterm>交互来建立<glossterm linkend="glossary-session">session</glossterm>的任何进程，可能是远程的。
+     通过<glossterm linkend="glossary-connection">connecting</glossterm>到<glossterm linkend="glossary-instance">instance</glossterm>与<glossterm linkend="glossary-database">database</glossterm>交互来建立<glossterm linkend="glossary-session">session</glossterm>的任何进程，可能是远程的。
     </para>
    </glossdef>
   </glossentry>

postgresql/doc/src/sgml/high-availability.sgml

@@ -1477,7 +1477,7 @@ ____________________________________________________________________________-->
     </para>
 ____________________________________________________________________________-->
     <para>
-     你可以通过<link linkend="monitoring-pg-stat-replication-view"><structname>视图检索 WAL 发送者进程的列表。
+     你可以通过<link linkend="monitoring-pg-stat-replication-view"><structname>pg_stat_replication</structname></link>视图检索 WAL 发送者进程的列表。
      <function>pg_current_wal_lsn</function>与<literal>sent_lsn</literal>域之间的巨大差异表示主服务器承受着巨大的负载，而<literal>sent_lsn</literal>和后备服务器上<function>pg_last_wal_receive_lsn</function>之间的差异可能表示网络延迟或者后备服务器正承受着巨大的负载。
     </para>
 <!--==========================orignal english content==========================

postgresql/doc/src/sgml/indexam.sgml

@@ -139,6 +139,8 @@ typedef struct IndexAmRoutine
     uint16      amstrategies;
     /* total number of support functions that this AM uses */
     uint16      amsupport;
+    /* opclass options support function number or 0 */
+    uint16      amoptsprocnum;
     /* does AM support ORDER BY indexed column's value? */
     bool        amcanorder;
     /* does AM support ORDER BY result of an operator on indexed column? */
@@ -165,6 +167,10 @@ typedef struct IndexAmRoutine
     bool        amcanparallel;
     /* does AM support columns included with clause INCLUDE? */
     bool        amcaninclude;
+    /* does AM use maintenance_work_mem? */
+    bool        amusemaintenanceworkmem;
+    /* OR of parallel vacuum flags */
+    uint8       amparallelvacuumoptions;
     /* type of data stored in index, or InvalidOid if variable */
     Oid         amkeytype;
 
@@ -604,7 +610,7 @@ amcanreturn (Relation indexRelation, int attno);
    linkend="indexes-index-only-scans"><firstterm>index-only scans</firstterm></link> on
    the given column, by returning the indexed column values for an index entry
    in the form of an <structname>IndexTuple</structname>.  The attribute number
-   is 1-based, i.e. the first column's attno is 1. Returns true if supported,
+   is 1-based, i.e., the first column's attno is 1. Returns true if supported,
    else false.  If the access method does not support index-only scans at all,
    the <structfield>amcanreturn</structfield> field in its <structname>IndexAmRoutine</structname>
    struct can be set to NULL.
@@ -889,7 +895,7 @@ amgettuple (IndexScanDesc scan,
    will pass the caller's snapshot test.  On success, <function>amgettuple</function>
    must also set <literal>scan-&gt;xs_recheck</literal> to true or false.
    False means it is certain that the index entry matches the scan keys.
-   true means this is not certain, and the conditions represented by the
+   True means this is not certain, and the conditions represented by the
    scan keys must be rechecked against the heap tuple after fetching it.
    This provision supports <quote>lossy</quote> index operators.
    Note that rechecking will extend only to the scan conditions; a partial

postgresql/doc/src/sgml/install-windows.sgml

@@ -77,8 +77,7 @@ ____________________________________________________________________________-->
   <productname>Cygwin</productname> is not recommended for running a
   production server, and it should only be used for running on
   older versions of <productname>Windows</productname> where
-  the native build does not work, such as
-  <productname>Windows 98</productname>. The official
+  the native build does not work. The official
   binaries are built using <productname>Visual Studio</productname>.
  </para>
 ____________________________________________________________________________-->
@@ -184,14 +183,19 @@ ____________________________________________________________________________-->
   <application>Visual Studio Command Prompt</application>.
   If you wish to build a 64-bit version, you must use the 64-bit version of
   the command, and vice versa.
-  In the <productname>Microsoft Windows SDK</productname>, start the
-  <application>CMD shell</application> listed under the SDK on the Start Menu.
-  In recent SDK versions you can change the targeted CPU architecture, build
-  type, and target OS by using the <command>setenv</command> command, e.g.
-  <command>setenv /x86 /release /xp</command> to target Windows XP or later
-  with a 32-bit release build. See <command>/?</command> for other options to
-  <command>setenv</command>.  All commands should be run from the
-  <filename>src\tools\msvc</filename> directory.
+  Starting with <productname>Visual Studio 2017</productname> this can be
+  done from the command line using <command>VsDevCmd.bat</command>, see
+  <command>-help</command> for the available options and their default values.
+  <command>vsvars32.bat</command> is available in
+  <productname>Visual Studio 2015</productname> and earlier versions for the
+  same purpose.
+  From the <application>Visual Studio Command Prompt</application>, you can
+  change the targeted CPU architecture, build type, and target OS by using the
+  <command>vcvarsall.bat</command> command, e.g.,
+  <command>vcvarsall.bat x64 10.0.10240.0</command> to target Windows 10
+  with a 64-bit release build. See <command>-help</command> for the other
+  options of <command>vcvarsall.bat</command>. All commands should be run from
+  the <filename>src\tools\msvc</filename> directory.
  </para>
 ____________________________________________________________________________-->
  <para>
@@ -378,7 +382,7 @@ ____________________________________________________________________________-->
         installations <filename>C:\Program Files\GnuWin32</filename>.
         Consider installing into <filename>C:\GnuWin32</filename> or use the
         NTFS short name path to GnuWin32 in your PATH environment setting
-        (e.g. <filename>C:\PROGRA~1\GnuWin32</filename>).
+        (e.g., <filename>C:\PROGRA~1\GnuWin32</filename>).
        </para>
      </note>
 
@@ -415,7 +419,7 @@ ____________________________________________________________________________-->
      <listitem><para>
       Required for GSSAPI authentication support. MIT Kerberos can be
       downloaded from
-      <ulink url="http://web.mit.edu/Kerberos/dist/index.html"></ulink>.
+      <ulink url="https://web.mit.edu/Kerberos/dist/index.html"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -424,7 +428,7 @@ ____________________________________________________________________________-->
       <productname>libxslt</productname></term>
      <listitem><para>
       Required for XML support. Binaries can be downloaded from
-      <ulink url="http://zlatkovic.com/pub/libxml"></ulink> or source from
+      <ulink url="https://zlatkovic.com/pub/libxml"></ulink> or source from
       <ulink url="http://xmlsoft.org"></ulink>. Note that libxml2 requires iconv,
       which is available from the same download location.
      </para></listitem>
@@ -461,7 +465,7 @@ ____________________________________________________________________________-->
      <listitem><para>
       Required for compression support in <application>pg_dump</application>
       and <application>pg_restore</application>. Binaries can be downloaded
-      from <ulink url="http://www.zlib.net"></ulink>.
+      from <ulink url="https://www.zlib.net"></ulink>.
      </para></listitem>
     </varlistentry>
 

postgresql/doc/src/sgml/intro.sgml

@@ -149,7 +149,7 @@ ____________________________________________________________________________-->
   <para>
    <productname>PostgreSQL</productname> is an object-relational
    database management system (<acronym>ORDBMS</acronym>) based on
-   <ulink url="http://db.cs.berkeley.edu/postgres.html">
+   <ulink url="https://dsf.berkeley.edu/postgres.html">
    <productname>POSTGRES, Version 4.2</productname></ulink>,
    developed at the University of California at Berkeley Computer Science
    Department.  POSTGRES pioneered many concepts that only became