Skip to content

Commit 57165ec

Browse files
committed
修正编译错误
1 parent abb8a1c commit 57165ec

14 files changed

+20
-26
lines changed

postgresql/doc/src/sgml/catalogs.sgml

+2-4
Original file line numberDiff line numberDiff line change
@@ -4737,10 +4737,8 @@
47374737
</para>
47384738
-->
47394739
<para>
4740-
<structname>pg_event_trigger</structname>表存储时间触发器。参阅<xref linkend="event-
4741-
4742-
triggers">
4743-
获取详细信息。
4740+
<structname>pg_event_trigger</structname>表存储时间触发器。
4741+
参阅<xref linkend="event-triggers">获取详细信息。
47444742
</para>
47454743

47464744
<table>

postgresql/doc/src/sgml/client-auth.sgml

+1-4
Original file line numberDiff line numberDiff line change
@@ -730,10 +730,7 @@ hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable>
730730
</para>
731731
</listitem>
732732
</varlistentry>
733-
734-
</listitem>
735-
</varlistentry>
736-
733+
737734
<varlistentry>
738735
<term><literal>ident</></term>
739736
<listitem>

postgresql/doc/src/sgml/datatype.sgml

-1
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,6 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
13661366
</para>
13671367
</note>
13681368

1369-
<note>
13701369
<!--
13711370
<para>
13721371
To insert the next value of the sequence into the <type>serial</type>

postgresql/doc/src/sgml/func.sgml

-3
Original file line numberDiff line numberDiff line change
@@ -15078,7 +15078,6 @@ table2-mapping
1507815078
</entry>
1507915079
</row>
1508015080
<row>
15081-
<entry>
1508215081
<entry><para><literal>json_populate_record(base anyelement, from_json json)</literal>
1508315082
</para><para><literal>jsonb_populate_record(base anyelement, from_json jsonb)</literal>
1508415083
</para></entry>
@@ -24416,14 +24415,12 @@ WAL生成的速度和可用的磁盘空间。
2441624415
relation. The second argument can be provided to specify which fork
2441724416
to examine:
2441824417
-->
24419-
<para>
2442024418
<function>pg_relation_size</>接受一个表、索引、压缩表的 OID 或者名字,
2442124419
然后返回该关系的一个分支以字节计的磁盘大小。(请注意,
2442224420
对于大多数场合,使用高级函数<function>pg_total_relation_size</>
2442324421
或<function>pg_table_size</>更加方便,它们统计所有分支的总和。)
2442424422
带有一个参数,它返回该关系的主数据分支的大小。
2442524423
可以提供第二个参数声明检测那个分支:
24426-
</para>
2442724424

2442824425
<itemizedlist spacing="compact">
2442924426
<listitem>

postgresql/doc/src/sgml/libpq.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10411,7 +10411,7 @@ TCP(主机名<literal>localhost</>)和Unix域套接字(<literal>pghost</>
1041110411
at <filename>~/.pg_service.conf</filename> or the location
1041210412
specified by the environment variable <envar>PGSERVICEFILE</envar>,
1041310413
or it can be a system-wide file
10414-
at <filename>`pg_config --sysconfdir`/pg_service.conf</filename> or in the directory
10414+
at <filename>`pg_config &minus;-sysconfdir`/pg_service.conf</filename> or in the directory
1041510415
specified by the environment variable
1041610416
<envar>PGSYSCONFDIR</envar>. If service definitions with the same
1041710417
name exist in the user and the system file, the user file takes

postgresql/doc/src/sgml/ref/alter_extension.sgml

-3
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,6 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
229229
</para>
230230
</listitem>
231231
</varlistentry>
232-
</para>
233-
</listitem>
234-
</varlistentry>
235232

236233
<varlistentry>
237234
<term><replaceable>source_type</replaceable></term>

postgresql/doc/src/sgml/ref/alter_index.sgml

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
156156

157157
</variablelist>
158158
</para>
159-
</para>
160159

161160

162161
</refsect1>

postgresql/doc/src/sgml/ref/create_aggregate.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
147147
<replaceable class="PARAMETER">ffunc</replaceable>.
148148
These are used as follows:
149149
<programlisting>
150-
<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state
151-
<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) ---> aggregate-value
150+
<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) &minus;&minus;-> next-internal-state
151+
<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) &minus;&minus;-> aggregate-value
152152
</programlisting>
153153
</para>
154154
-->

postgresql/doc/src/sgml/ref/create_view.sgml

+3-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,9 @@ CREATE VIEW <replaceable>name</> AS WITH RECURSIVE <replaceable>name</> (<replac
239239
</varlistentry>
240240
</variablelist>
241241
</para>
242-
242+
</listitem>
243+
</varlistentry>
244+
243245
<varlistentry>
244246
<term><replaceable class="parameter">query</replaceable></term>
245247
<listitem>

postgresql/doc/src/sgml/ref/createuser.sgml

+2-1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ PostgreSQL documentation
198198
</para>
199199
</listitem>
200200
</varlistentry>
201+
202+
<varlistentry>
201203
<term><option>-g <replaceable class="parameter">role</replaceable></></term>
202204
<term><option>--role=<replaceable class="parameter">role</replaceable></></term>
203205
<listitem>
@@ -216,7 +218,6 @@ PostgreSQL documentation
216218
</listitem>
217219
</varlistentry>
218220

219-
<varlistentry>
220221
<varlistentry>
221222
<term><option>-i</></term>
222223
<term><option>--inherit</></term>

postgresql/doc/src/sgml/release-9.0.sgml

+1
Original file line numberDiff line numberDiff line change
@@ -4450,6 +4450,7 @@ WAL更新可能会应用到错误的页面,超出它应该做的好多页面
44504450
</para>
44514451
</listitem>
44524452

4453+
<listitem>
44534454
<!--
44544455
<para>
44554456
Fix <application>pg_dumpall</> to work when a source database

postgresql/doc/src/sgml/release-9.3.sgml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1048,9 +1048,10 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
10481048
or <command>DELETE</> (Etsuro Fujita)
10491049
</para>
10501050
-->
1051-
在<literal>READ COMMITTED</>检查发生在在<command>SELECT FOR UPDATE</>、
1051+
<para>
1052+
当<literal>READ COMMITTED</>再检查发生在<command>SELECT FOR UPDATE</>、
10521053
<command>UPDATE</>或<command>DELETE</>中锁定了行之后时,
1053-
确保正确的报告外表的<structfield>tableoid</> (Etsuro Fujita)
1054+
确保正确的报告外部表的<structfield>tableoid</> (Etsuro Fujita)
10541055
</para>
10551056
</listitem>
10561057

@@ -3661,6 +3662,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
36613662
being archived again when the standby is promoted (Andres Freund)
36623663
</para>
36633664
-->
3665+
<para>
36643666
阻止提升备用服务器时,<literal>pg_basebackup -x/-X</>
36653667
创建的WAL文件被再次归档 (Andres Freund)
36663668
</para>

postgresql/doc/src/sgml/runtime.sgml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1668,10 +1668,11 @@ To set a new value for <varname>SHMMAX</>, run:
16681668
<!--
16691669
<term><systemitem class="osname">Solaris</> 2.6 to 2.9 (Solaris
16701670
6 to Solaris 9)
1671-
<indexterm><primary>Solaris</><secondary>IPC configuration</></>
1671+
<indexterm><primary>Solaris</><secondary>IPC configuration</></>
1672+
</term>
16721673
-->
16731674
<term><systemitem class="osname">Solaris</> 2.6 到 2.9 (Solaris
1674-
6 到 Solaris 9)</term>
1675+
6 到 Solaris 9)
16751676
<indexterm><primary>Solaris</><secondary>IPC 配置</></>
16761677
</term>
16771678
<listitem>

postgresql/doc/src/sgml/syntax.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ There is a second kind of identifier: the <firstterm>delimited
248248
identifier</firstterm> or <firstterm>quoted
249249
identifier</firstterm>. It is formed by enclosing an arbitrary
250250
sequence of characters in double-quotes
251-
(<literal>"</literal>). <!-- " font-lock mania --> A delimited
251+
(<literal>"</literal>). --><!-- " font-lock mania --><!-- A delimited
252252
identifier is always an identifier, never a key word. So
253253
<literal>"select"</literal> could be used to refer to a column or
254254
table named <quote>select</quote>, whereas an unquoted

0 commit comments

Comments
 (0)