Skip to content

Commit 61de01b

Browse files
[ecpg-ref initdb insert]: restored some translations; fixed some errors
1 parent 17605b4 commit 61de01b

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

postgresql/doc/src/sgml/ref/ecpg-ref.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ ________________________________________________________-->
173173
</para>
174174
________________________________________________________-->
175175
<para>
176-
定义一个预处理器符号,相当于<command>EXEC SQL DEFINE</command>指令。如果没有指定<replaceable></replaceable>,
176+
定义一个预处理器符号,相当于<command>EXEC SQL DEFINE</command>指令。如果没有指定<replaceable>value</replaceable>,
177177
则该符号将被定义为值<literal>1</literal>。
178178
</para>
179179
<!-- pgdoc-cn_end sig_en=565ca4385dc1aacfbf869424c38e9cbc -->
@@ -253,7 +253,7 @@ ________________________________________________________-->
253253
</para>
254254
________________________________________________________-->
255255
<para>
256-
指定<command>ecpg</command>应将所有输出写入给定的<replaceable>文件名</replaceable>。
256+
指定<command>ecpg</command>应将所有输出写入给定的<replaceable>filename</replaceable>。
257257
写入<literal>-o -</literal>以将所有输出发送到标准输出。
258258
</para>
259259
<!-- pgdoc-cn_end sig_en=a2b6cf5b263cfe0f795c0ebc941bb436 -->
@@ -299,7 +299,7 @@ ________________________________________________________-->
299299
</variablelist></para>
300300
________________________________________________________-->
301301
<para>
302-
选择运行时行为。<replaceable>选项</replaceable>可以是以下之一:
302+
选择运行时行为。<replaceable>Option</replaceable>可以是以下之一:
303303
<variablelist>
304304
<varlistentry>
305305
<term><option>no_indicator</option></term>

postgresql/doc/src/sgml/ref/initdb.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ ________________________________________________________-->
658658
</para>
659659
________________________________________________________-->
660660
<para>
661-
这个选项指定了写前日志应该存储的目录
661+
这个选项指定了预写日志应该存储的目录
662662
</para>
663663
<!-- pgdoc-cn_end sig_en=eca2b770df072bfd00fff230f1077dad -->
664664
</listitem>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,9 @@ ________________________________________________________-->
162162
</para>
163163
________________________________________________________-->
164164
<para>
165-
<command>INSERT</command> into tables that lack unique indexes will
166-
not be blocked by concurrent activity. Tables with unique indexes
167-
might block if concurrent sessions perform actions that lock or modify
168-
rows matching the unique index values being inserted; the details
169-
are covered in <xref linkend="index-unique-checks"/>.
165+
<command>INSERT</command>缺少唯一索引的表不会被并发活动阻塞。
166+
如果并发会话执行锁定或修改与要插入的唯一索引值匹配的行的操作,则具有唯一索引的表可能会阻塞;
167+
详细信息在<xref linkend="index-unique-checks"/>中介绍。
170168
<literal>ON CONFLICT</literal>可以用来指定替代操作,以避免引发唯一约束或排他约束违反错误。
171169
(参见下面的<xref linkend="sql-on-conflict"/>。)
172170
</para>

0 commit comments

Comments
 (0)