Fix conflicts for sgml

Author: chenjinbao1989

doc/src/sgml/catalogs.sgml

@@ -1017,124 +1017,6 @@ CREATE COLLATION german (provider = libc, locale = 'de_DE');
 
    <sect4 id="collation-managing-create-icu">
     <title>ICU Collations</title>
-
-<<<<<<< HEAD
-   <para>
-    ICU allows collations to be customized beyond the basic language+country
-    set that is preloaded by <command>initdb</command>.  Users are encouraged
-    to define their own collation objects that make use of these facilities to
-    suit the sorting behavior to their requirements.
-    See <ulink url="https://unicode-org.github.io/icu/userguide/locale/"></ulink>
-    and <ulink url="https://unicode-org.github.io/icu/userguide/collation/api.html"></ulink> for
-    information on ICU locale naming.  The set of acceptable names and
-    attributes depends on the particular ICU version.
-   </para>
-
-   <para>
-    Here are some examples:
-
-    <variablelist>
-     <varlistentry>
-      <term><literal>CREATE COLLATION "de-u-co-phonebk-x-icu" (provider = icu, locale = 'de-u-co-phonebk');</literal></term>
-      <term><literal>CREATE COLLATION "de-u-co-phonebk-x-icu" (provider = icu, locale = 'de@collation=phonebook');</literal></term>
-      <listitem>
-       <para>German collation with phone book collation type</para>
-       <para>
-        The first example selects the ICU locale using a <quote>language
-        tag</quote> per BCP 47.  The second example uses the traditional
-        ICU-specific locale syntax.  The first style is preferred going
-        forward, but it is not supported by older ICU versions.
-       </para>
-       <para>
-        Note that you can name the collation objects in the SQL environment
-        anything you want.  In this example, we follow the naming style that
-        the predefined collations use, which in turn also follow BCP 47, but
-        that is not required for user-defined collations.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>CREATE COLLATION "und-u-co-emoji-x-icu" (provider = icu, locale = 'und-u-co-emoji');</literal></term>
-      <term><literal>CREATE COLLATION "und-u-co-emoji-x-icu" (provider = icu, locale = '@collation=emoji');</literal></term>
-      <listitem>
-       <para>
-        Root collation with Emoji collation type, per Unicode Technical Standard #51
-       </para>
-       <para>
-        Observe how in the traditional ICU locale naming system, the root
-        locale is selected by an empty string.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>CREATE COLLATION latinlast (provider = icu, locale = 'en-u-kr-grek-latn');</literal></term>
-      <term><literal>CREATE COLLATION latinlast (provider = icu, locale = 'en@colReorder=grek-latn');</literal></term>
-      <listitem>
-       <para>
-        Sort Greek letters before Latin ones.  (The default is Latin before Greek.)
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>CREATE COLLATION upperfirst (provider = icu, locale = 'en-u-kf-upper');</literal></term>
-      <term><literal>CREATE COLLATION upperfirst (provider = icu, locale = 'en@colCaseFirst=upper');</literal></term>
-      <listitem>
-       <para>
-        Sort upper-case letters before lower-case letters.  (The default is
-        lower-case letters first.)
-       </para>
-      </listitem>
-     </varlistentry>
-
-    <varlistentry>
-      <term><literal>CREATE COLLATION special (provider = icu, locale = 'en-u-kf-upper-kr-grek-latn');</literal></term>
-      <term><literal>CREATE COLLATION special (provider = icu, locale = 'en@colCaseFirst=upper;colReorder=grek-latn');</literal></term>
-      <listitem>
-       <para>
-        Combines both of the above options.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>CREATE COLLATION numeric (provider = icu, locale = 'en-u-kn-true');</literal></term>
-      <term><literal>CREATE COLLATION numeric (provider = icu, locale = 'en@colNumeric=yes');</literal></term>
-      <listitem>
-       <para>
-        Numeric ordering, sorts sequences of digits by their numeric value,
-        for example: <literal>A-21</literal> &lt; <literal>A-123</literal>
-        (also known as natural sort).
-       </para>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-
-    See <ulink url="https://www.unicode.org/reports/tr35/tr35-collation.html">Unicode
-    Technical Standard #35</ulink>
-    and <ulink url="https://tools.ietf.org/html/bcp47">BCP 47</ulink> for
-    details.  The list of possible collation types (<literal>co</literal>
-    subtag) can be found in
-    the <ulink url="https://github.com/unicode-org/cldr/blob/master/common/bcp47/collation.xml">CLDR
-    repository</ulink>.
-   </para>
-
-   <para>
-    Note that while this system allows creating collations that <quote>ignore
-    case</quote> or <quote>ignore accents</quote> or similar (using the
-    <literal>ks</literal> key), in order for such collations to act in a
-    truly case- or accent-insensitive manner, they also need to be declared as not
-    <firstterm>deterministic</firstterm> in <command>CREATE COLLATION</command>;
-    see <xref linkend="collation-nondeterministic"/>.
-    Otherwise, any strings that compare equal according to the collation but
-    are not byte-wise equal will be sorted according to their byte values.
-   </para>
-
-   <note>
-=======
->>>>>>> REL_16_9
     <para>
      ICU collations can be created like:
 

doc/src/sgml/charset.sgml

@@ -2016,8 +2016,6 @@ include_dir 'conf.d'
         that has no effect on the number of dead tuples that autovacuum can
         collect while scanning a table.
        </para>
-<<<<<<< HEAD
-=======
       </listitem>
      </varlistentry>
 
@@ -2048,7 +2046,6 @@ include_dir 'conf.d'
         setting may cause too many other useful pages to be evicted from
         shared buffers.
        </para>
->>>>>>> REL_16_9
       </listitem>
      </varlistentry>
 
@@ -2898,14 +2895,8 @@ include_dir 'conf.d'
         In fact, the server will not even start in this mode if
         <varname>max_wal_senders</varname> is non-zero.
         Note that changing <varname>wal_level</varname> to
-<<<<<<< HEAD
-        <literal>minimal</literal> makes any base backups taken before
-        unavailable for archive recovery and standby server, which may
-        lead to data loss. Cluster file encryption also does not support.
-=======
         <literal>minimal</literal> makes previous base backups unusable
         for point-in-time recovery and standby servers.
->>>>>>> REL_16_9
        </para>
        <para>
         In <literal>logical</literal> level, the same information is logged as
@@ -8105,22 +8096,13 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Enables the collection of information on the currently
         executing command of each session, along with its identifier and the
         time when that command began execution. This parameter is on by
-<<<<<<< HEAD
-        default. Note that even when enabled, this information is not
-        visible to all users, only to superusers, roles with privileges of the
-        <literal>pg_read_all_stats</literal> role and the user owning the
-        sessions being reported on (including sessions belonging to a role they
-        have the privileges of), so it should not represent a security risk.
-        Only superusers can change this setting.
-=======
         default. Note that even when enabled, this information is only
         visible to superusers, roles with privileges of the
         <literal>pg_read_all_stats</literal> role and the user owning the
         sessions being reported on (including sessions belonging to a role they
         have the privileges of), so it should not represent a security risk.
         Only superusers and users with the appropriate <literal>SET</literal>
         privilege can change this setting.
->>>>>>> REL_16_9
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/config.sgml

@@ -55,10 +55,6 @@ typedef struct RmgrData
     void        (*rm_decode) (struct LogicalDecodingContext *ctx,
                               struct XLogRecordBuffer *buf);
 } RmgrData;
-<<<<<<< HEAD
-</programlisting>  
- </para>
-=======
 </programlisting>
  </para>
 
@@ -68,7 +64,6 @@ typedef struct RmgrData
    resource managers.
   </para>
 
->>>>>>> REL_16_9
  <para>
   Then, register your new resource
   manager.
@@ -78,31 +73,18 @@ typedef struct RmgrData
  * Register a new custom WAL resource manager.
  *
  * Resource manager IDs must be globally unique across all extensions. Refer
-<<<<<<< HEAD
- * to https://wiki.postgresql.org/wiki/CustomWALResourceManager to reserve a
-=======
  * to https://wiki.postgresql.org/wiki/CustomWALResourceManagers to reserve a
->>>>>>> REL_16_9
  * unique RmgrId for your extension, to avoid conflicts with other extension
  * developers. During development, use RM_EXPERIMENTAL_ID to avoid needlessly
  * reserving a new ID.
  */
-<<<<<<< HEAD
-extern void RegisterCustomRmgr(RmgrId rmid, RmgrData *rmgr);
-=======
 extern void RegisterCustomRmgr(RmgrId rmid, const RmgrData *rmgr);
->>>>>>> REL_16_9
 </programlisting>
   <function>RegisterCustomRmgr</function> must be called from the
   extension module's <link linkend="xfunc-c-dynload">_PG_init</link> function.
   While developing a new extension, use <literal>RM_EXPERIMENTAL_ID</literal>
-<<<<<<< HEAD
-  for <parameter>rmid</parameter>. When you ready to release the extension to
-  users, reserve a new resource manager ID at the <ulink
-=======
   for <parameter>rmid</parameter>. When you are ready to release the extension
   to users, reserve a new resource manager ID at the <ulink
->>>>>>> REL_16_9
   url="https://wiki.postgresql.org/wiki/CustomWALResourceManagers">Custom WAL
   Resource Manager</ulink> page.
  </para>
@@ -113,11 +95,7 @@ extern void RegisterCustomRmgr(RmgrId rmid, const RmgrData *rmgr);
   during <productname>PostgreSQL</productname> startup.
  </para>
  <note>
-<<<<<<< HEAD
-   <para>    
-=======
    <para>
->>>>>>> REL_16_9
     The extension must remain in shared_preload_libraries as long as any
     custom WAL records may exist in the system. Otherwise
     <productname>PostgreSQL</productname> will not be able to apply or decode

doc/src/sgml/custom-rmgr.sgml

@@ -2872,13 +2872,6 @@ P <optional> <replaceable>years</replaceable>-<replaceable>months</replaceable>-
     </para>
 
     <para>
-<<<<<<< HEAD
-     Field values can have fractional parts:  for example, <literal>'1.5
-     weeks'</literal> or <literal>'01:02:03.45'</literal>.  However,
-     because interval internally stores only three integer units (months,
-     days, microseconds), fractional units must be spilled to smaller
-     units.  Fractional parts of units greater than months are truncated to
-=======
      Internally, <type>interval</type> values are stored as three integral
      fields: months, days, and microseconds.  These fields are kept
      separate because the number of days in a month varies, while a day
@@ -2905,7 +2898,6 @@ SELECT '2 years 15 months 100 weeks 99 hours 123456789 milliseconds'::interval;
      because <type>interval</type> internally stores only integral fields,
      fractional values must be converted into smaller
      units.  Fractional parts of units greater than months are rounded to
->>>>>>> REL_16_9
      be an integer number of months, e.g. <literal>'1.5 years'</literal>
      becomes <literal>'1 year 6 mons'</literal>.  Fractional parts of
      weeks and days are computed to be an integer number of days and
@@ -2954,36 +2946,6 @@ SELECT '2 years 15 months 100 weeks 99 hours 123456789 milliseconds'::interval;
       </tgroup>
      </table>
 
-<<<<<<< HEAD
-    <para>
-     Internally <type>interval</type> values are stored as months, days,
-     and microseconds. This is done because the number of days in a month
-     varies, and a day can have 23 or 25 hours if a daylight savings
-     time adjustment is involved.  The months and days fields are integers
-     while the microseconds field can store fractional seconds.  Because intervals are
-     usually created from constant strings or <type>timestamp</type> subtraction,
-     this storage method works well in most cases, but can cause unexpected
-     results:
-
-<programlisting>
-SELECT EXTRACT(hours from '80 minutes'::interval);
- date_part
------------
-         1
-
-SELECT EXTRACT(days from '80 hours'::interval);
- date_part
------------
-         0
-</programlisting>
-
-     Functions <function>justify_days</function> and
-     <function>justify_hours</function> are available for adjusting days
-     and hours that overflow their normal ranges.
-    </para>
-
-=======
->>>>>>> REL_16_9
    </sect2>
 
    <sect2 id="datatype-interval-output">