Skip to content

Commit c127d9f

Browse files
authored
Merge pull request #266 from sunshinerxu/master
Fix: 19.14, Part VI, 52.18内部分内容未翻译
2 parents f9c2254 + 89410e3 commit c127d9f

13 files changed

+41
-84
lines changed

postgresql/doc/src/sgml/catalogs.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5684,7 +5684,7 @@ ____________________________________________________________________________-->
56845684
<row>
56855685
<entry><structfield>objid</structfield></entry>
56865686
<entry><type>oid</type></entry>
5687-
<entry>any OID column</entry>
5687+
<entry>任意OID列</entry>
56885688
<entry>指定依赖对象的OID</entry>
56895689
</row>
56905690

@@ -5736,7 +5736,7 @@ ____________________________________________________________________________-->
57365736
<row>
57375737
<entry><structfield>refobjid</structfield></entry>
57385738
<entry><type>oid</type></entry>
5739-
<entry>any OID column</entry>
5739+
<entry>任意OID列</entry>
57405740
<entry>指定被引用对象的OID</entry>
57415741
</row>
57425742

@@ -6058,7 +6058,7 @@ ____________________________________________________________________________-->
60586058
<row>
60596059
<entry><structfield>objoid</structfield></entry>
60606060
<entry><type>oid</type></entry>
6061-
<entry>any OID column</entry>
6061+
<entry>任意OID列</entry>
60626062
<entry>描述所属对象的OID</entry>
60636063
</row>
60646064

@@ -11216,7 +11216,7 @@ ____________________________________________________________________________-->
1121611216
<row>
1121711217
<entry><structfield>objoid</structfield></entry>
1121811218
<entry><type>oid</type></entry>
11219-
<entry>any OID column</entry>
11219+
<entry>任意OID列</entry>
1122011220
<entry>该安全标签依附的对象的OID</entry>
1122111221
</row>
1122211222

@@ -15486,7 +15486,7 @@ ____________________________________________________________________________-->
1548615486
<!--==========================orignal english content==========================
1548715487
<title>System Views</title>
1548815488
____________________________________________________________________________-->
15489-
<title>System Views</title>
15489+
<title>系统视图</title>
1549015490

1549115491
<!--==========================orignal english content==========================
1549215492
<para>
@@ -19359,7 +19359,7 @@ ____________________________________________________________________________-->
1935919359
<row>
1936019360
<entry><structfield>objoid</structfield></entry>
1936119361
<entry><type>oid</type></entry>
19362-
<entry>any OID column</entry>
19362+
<entry>任意OID列</entry>
1936319363
<entry>安全标签所属对象的OID</entry>
1936419364
</row>
1936519365
<!--==========================orignal english content==========================

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2457,7 +2457,7 @@ ____________________________________________________________________________-->
24572457
</para>
24582458
____________________________________________________________________________-->
24592459
<para>
2460-
LDAP 认证可以在两种模式下操作。在第一种模式中(我们将称之为简单绑定模式),服务器将绑定到构造成<replaceable>prefix</replaceable> <replaceable>username</replaceable> <replaceable>suffix</replaceable>的可区分名称。通常,<replaceable>prefix</replaceable>参数被用于指定 <literal>cn=</literal>或者一个活动录环境中的<replaceable>DOMAIN</replaceable><literal>\</literal>。<replaceable>suffix</replaceable>被用来指定非活动目录环境中的DN的剩余部分。
2460+
LDAP 认证可以在两种模式下操作。在第一种模式中(我们将称之为简单绑定模式),服务器将绑定到构造成<replaceable>prefix</replaceable> <replaceable>username</replaceable> <replaceable>suffix</replaceable>的可区分名称。通常,<replaceable>prefix</replaceable>参数被用于指定 <literal>cn=</literal>或者一个活动目录环境中的<replaceable>DOMAIN</replaceable><literal>\</literal>。<replaceable>suffix</replaceable>被用来指定非活动目录环境中的DN的剩余部分。
24612461
</para>
24622462

24632463
<!--==========================orignal english content==========================

postgresql/doc/src/sgml/config.sgml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13308,11 +13308,7 @@ ____________________________________________________________________________-->
1330813308
</para>
1330913309
____________________________________________________________________________-->
1331013310
<para>
13311-
When set to false, which is the default, <productname>PostgreSQL</productname>
13312-
will raise a PANIC-level error on failure to flush modified data files
13313-
to the filesystem. This causes the database server to crash.
13314-
当设置为false(默认值),<productname>PostgreSQL</productname>
13315-
把修改的数据文件刷新到文件系统失败,将引发PANIC级错误。 这会导致数据库服务器崩溃。
13311+
如果设置为false(默认值),<productname>PostgreSQL</productname>在将修改的数据文件刷新到文件系统失败时,将引发PANIC级错误。这样会导致数据库服务器崩溃。
1331613312
</para>
1331713313
<!--==========================orignal english content==========================
1331813314
<para>
@@ -13327,14 +13323,7 @@ ____________________________________________________________________________-->
1332713323
</para>
1332813324
____________________________________________________________________________-->
1332913325
<para>
13330-
On some operating systems, the status of data in the kernel's page
13331-
cache is unknown after a write-back failure. In some cases it might
13332-
have been entirely forgotten, making it unsafe to retry; the second
13333-
attempt may be reported as successful, when in fact the data has been
13334-
lost. In these circumstances, the only way to avoid data loss is to
13335-
recover from the WAL after any failure is reported, preferably
13336-
after investigating the root cause of the failure and replacing any
13337-
faulty hardware.
13326+
在某些操作系统上,回写失败后,内核页面缓存中的数据状态未知。 在某些情况下,它可能已被完全遗忘,因此重试不安全;第二次尝试可能报告为成功,而事实上数据已丢失。在此类情形下,避免数据丢失的唯一方法是在报告任何故障后从WAL中恢复,最好是在调查了故障的根本原因并更换了任何有故障的硬件之后。
1333813327
</para>
1333913328
<!--==========================orignal english content==========================
1334013329
<para>
@@ -13346,11 +13335,7 @@ ____________________________________________________________________________-->
1334613335
</para>
1334713336
____________________________________________________________________________-->
1334813337
<para>
13349-
If set to true, <productname>PostgreSQL</productname> will instead
13350-
report an error but continue to run so that the data flushing
13351-
operation can be retried in a later checkpoint. Only set it to true
13352-
after investigating the operating system's treatment of buffered data
13353-
in case of write-back failure.
13338+
如果设置为true,<productname>PostgreSQL</productname>将报告错误,但会继续运行,以便可以在以后的检查点中重试数据刷新操作。仅在调查操作系统假如回写失败时对缓冲数据的处理方式的情况下,才将其设置为true。
1335413339
</para>
1335513340
</listitem>
1335613341
</varlistentry>

postgresql/doc/src/sgml/docguide.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ ____________________________________________________________________________-->
683683
</para>
684684
____________________________________________________________________________-->
685685
<para>
686-
便以文档可能会花很长时间。但是有办法只检查文档中的语法,这个过程只需要数秒:
686+
编译文档可能会花很长时间。但是有办法只检查文档中的语法,这个过程只需要数秒:
687687
<screen>
688688
<prompt>doc/src/sgml$ </prompt><userinput>make check</userinput>
689689
</screen>

0 commit comments

Comments
 (0)