Skip to content

Commit 6f4cff9

Browse files
committed
fix problems during compilation
# Conflicts: # postgresql/doc/src/sgml/pageinspect.sgml # postgresql/doc/src/sgml/pgstatstatements.sgml # postgresql/doc/src/sgml/planstats.sgml # postgresql/doc/src/sgml/protocol.sgml # postgresql/doc/src/sgml/queries.sgml # postgresql/doc/src/sgml/ref/create_table_as.sgml # postgresql/doc/src/sgml/ref/initdb.sgml # postgresql/doc/src/sgml/ref/pg_restore.sgml # postgresql/doc/src/sgml/textsearch.sgml # postgresql/doc/src/sgml/xfunc.sgml
1 parent e3f04f8 commit 6f4cff9

File tree

5 files changed

+458
-9
lines changed

5 files changed

+458
-9
lines changed

postgresql/doc/src/sgml/ref/alter_collation.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,19 +241,19 @@ HINT: Rebuild all objects affected by this collation and run ALTER COLLATION pg
241241
some defense against corruption, but it is not completely reliable.
242242
</para>
243243
____________________________________________________________________________-->
244-
<pare>
244+
<para>
245245
使用 <literal>libc</literal> 提供的排序规则,并且 <productname>PostgreSQL</productname>
246246
是使用GNU C库构建的,则将C库的版本用作排序规则版本。由于排序规则定义通常仅随GNU C库发行版而更改,
247247
因此可以提供一些防止损坏的防御措施,但它并不是完全可靠的。
248-
</pare>
248+
</para>
249249
<!--==========================orignal english content==========================
250250
<para>
251251
Currently, there is no version tracking for the database default collation.
252252
</para>
253253
____________________________________________________________________________-->
254-
<pare>
254+
<para>
255255
当前,没有针对数据库默认排序规则的版本跟踪。
256-
</pare>
256+
</para>
257257

258258
<!--==========================orignal english content==========================
259259
<para>

postgresql/doc/src/sgml/ref/insert.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,11 +580,11 @@ ____________________________________________________________________________-->
580580
</variablelist>
581581
</refsect2>
582582

583-
<refsect2 id="sql-on-conflict"> xreflabel="ON CONFLICT Clause">
583+
<refsect2 id="sql-on-conflict" xreflabel="ON CONFLICT Clause">
584584
<!--==========================orignal english content==========================
585-
<title id="sql-on-conflict-title"><literal>ON CONFLICT</literal> Clause</title>
585+
<title><literal>ON CONFLICT</literal> Clause</title>
586586
____________________________________________________________________________-->
587-
<title id="sql-on-conflict-title"><literal>ON CONFLICT</literal> 子句</title>
587+
<title><literal>ON CONFLICT</literal> 子句</title>
588588
<!--==========================orignal english content==========================
589589
<indexterm zone="sql-insert">
590590
<primary>UPSERT</primary>

postgresql/doc/src/sgml/textsearch.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2316,7 +2316,7 @@ ____________________________________________________________________________-->
23162316
</para>
23172317
____________________________________________________________________________-->
23182318
<para>
2319-
在基于非片段的标题生成中,<function>ts_headline</function>为给定的<replaceable class="parameter">query</replaceable>查询查找匹配项,并选择一个要显示的匹配项,优先选择在允许标题长度内具有更多查询词的匹配项。
2319+
在基于非片段的标题生成中,<function>ts_headline</function>为给定的<replaceable class="parameter">query</replaceable>查找匹配项,并选择一个要显示的匹配项,优先选择在允许标题长度内具有更多查询词的匹配项。
23202320
在基于片段的标题生成中,<function>ts_headline</function>定位查询匹配项,并将每个匹配项拆分为<quote>fragments</quote>,每个匹配项不超过<literal>MaxWords</literal>个词,首选具有更多查询词的片段,并且在可能的情况下<quote>拉伸</quote>片段以包括周围的词。 因此,当查询匹配跨越文档的大部分时,或者当需要显示多个匹配时,基于片段的模式更有用。 在任一模式下,如果无法识别查询匹配项,则将显示文档中前 <literal>MinWords</literal> 单词的单个片段。
23212321
</para>
23222322

postgresql/doc/src/sgml/xindex.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,9 @@ ____________________________________________________________________________-->
893893
<title>Hash Support Functions</title>
894894
____________________________________________________________________________-->
895895
<title>哈希支持函数</title>
896+
<tgroup cols="2">
896897
<colspec colname="col1" colwidth="3*"/>
897898
<colspec colname="col2" colwidth="1*"/>
898-
<tgroup cols="2">
899899
<thead>
900900
<!--==========================orignal english content==========================
901901
<row>

0 commit comments

Comments
 (0)