Skip to content

Commit 5371b6f

Browse files
committed
PG 14 全量更新原文注释
1 parent 977bc44 commit 5371b6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2322
-616
lines changed

postgresql/doc/src/sgml/amcheck.sgml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ ____________________________________________________________________________-->
596596
<listitem>
597597
<!--==========================orignal english content==========================
598598
<para>
599-
A message describing the problem detected.
599+
A message describing the problem detected.
600600
</para>
601601
____________________________________________________________________________-->
602602
<para>
@@ -778,8 +778,6 @@ ____________________________________________________________________________-->
778778
</para>
779779
</listitem>
780780
</itemizedlist>
781-
In general, <filename>amcheck</filename> can only prove the presence of
782-
corruption; it cannot prove its absence.
783781
</para>
784782
____________________________________________________________________________-->
785783
<para>

postgresql/doc/src/sgml/datatype.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9092,9 +9092,9 @@ ____________________________________________________________________________-->
90929092

90939093
<sect1 id="datatype-pg-lsn">
90949094
<!--==========================orignal english content==========================
9095-
<title><acronym>pg_lsn Type</acronym></title>
9095+
<title><type>pg_lsn</type> Type</title>
90969096
____________________________________________________________________________-->
9097-
<title><acronym>pg_lsn 类型</acronym></title>
9097+
<title><type>pg_lsn</type> 类型</title>
90989098

90999099
<!--==========================orignal english content==========================
91009100
<indexterm zone="datatype-pg-lsn">

postgresql/doc/src/sgml/datetime.sgml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,31 +1552,32 @@ ____________________________________________________________________________-->
15521552

15531553
</sect1>
15541554

1555-
<!--==========================orignal english content==========================
15561555
<sect1 id="datetime-julian-dates">
1556+
<!--==========================orignal english content==========================
15571557
<title>Julian Dates</title>
1558+
____________________________________________________________________________-->
1559+
<title>儒略日期</title>
15581560

1561+
<!--==========================orignal english content==========================
15591562
<indexterm zone="datetime-julian-dates">
15601563
<primary>Julian date</primary>
15611564
</indexterm>
15621565
____________________________________________________________________________-->
1563-
<sect1 id="datetime-julian-dates">
1564-
<title>儒略日期</title>
1565-
15661566
<indexterm zone="datetime-julian-dates">
15671567
<primary>儒略日期</primary>
15681568
</indexterm>
15691569

15701570
<!--==========================orignal english content==========================
15711571
<para>
15721572
The <firstterm>Julian Date</firstterm> system is a method for
1573-
numbering days. It is unrelated to the Julian calendar though it is confusingly
1573+
numbering days. It is
1574+
unrelated to the Julian calendar, though it is confusingly
15741575
named similarly to that calendar.
15751576
The Julian Date system was invented by the French scholar
15761577
Joseph Justus Scaliger (1540&ndash;1609)
15771578
and probably takes its name from Scaliger's father,
15781579
the Italian scholar Julius Caesar Scaliger (1484&ndash;1558).
1579-
</para>
1580+
</para>
15801581
____________________________________________________________________________-->
15811582
<para>
15821583
<firstterm>儒略日期</firstterm>系统是一种计算天数的方法。它虽然在命名上很相似,但是它和儒略历法无关。儒略日期系统是法国学者 Joseph Justus Scaliger(1540&ndash;1609)(可能是取自其父亲的名字,即意大利学者 Julius Caesar Scaliger(1484&ndash;1558)发明的。
@@ -1603,7 +1604,8 @@ ____________________________________________________________________________-->
16031604
Although <productname>PostgreSQL</productname> supports Julian Date notation for
16041605
input and output of dates (and also uses Julian dates for some internal
16051606
datetime calculations), it does not observe the nicety of having dates
1606-
run from noon to noon. <productname>PostgreSQL</productname> treats a Julian Date as running from local midnight to local midnight, the same as a normal
1607+
run from noon to noon. <productname>PostgreSQL</productname> treats a Julian Date
1608+
as running from local midnight to local midnight, the same as a normal
16071609
date.
16081610
</para>
16091611
____________________________________________________________________________-->

postgresql/doc/src/sgml/dml.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ ____________________________________________________________________________-->
4848
<para>
4949
When a table is created, it contains no data. The first thing to
5050
do before a database can be of much use is to insert data. Data is
51-
conceptually inserted one row at a time. Of course you can also
52-
insert more than one row, but there is no way to insert less than
53-
one row. Even if you know only some column values, a
51+
inserted one row at a time. You can also insert more than one row
52+
in a single command, but it is not possible to insert something that
53+
is not a complete row. Even if you know only some column values, a
5454
complete row must be created.
5555
</para>
5656
____________________________________________________________________________-->
@@ -429,7 +429,7 @@ ____________________________________________________________________________-->
429429
<para>
430430
You use the <xref linkend="sql-delete"/>
431431
command to remove rows; the syntax is very similar to the
432-
<command>UPDATE</command> command. For instance, to remove all
432+
<xref linkend="sql-update"/> command. For instance, to remove all
433433
rows from the products table that have a price of 10, use:
434434
<programlisting>
435435
DELETE FROM products WHERE price = 10;

postgresql/doc/src/sgml/ecpg.sgml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7434,34 +7434,58 @@ ____________________________________________________________________________-->
74347434
<step><!--==========================orignal english content==========================
74357435
<simpara>Prepare a query, and declare a cursor for it.</simpara>
74367436
____________________________________________________________________________-->
7437+
<!--==========================orignal english content==========================
7438+
<simpara>Prepare a query, and declare a cursor for it.</simpara>
7439+
____________________________________________________________________________-->
74377440
<simpara>准备一个查询,并且为它声明一个游标。</simpara></step>
74387441
<step><!--==========================orignal english content==========================
74397442
<simpara>Declare an SQLDA for the result rows.</simpara>
74407443
____________________________________________________________________________-->
7444+
<!--==========================orignal english content==========================
7445+
<simpara>Declare an SQLDA for the result rows.</simpara>
7446+
____________________________________________________________________________-->
74417447
<simpara>为结果行声明一个 SQLDA 。</simpara></step>
74427448
<step><!--==========================orignal english content==========================
74437449
<simpara>Declare an SQLDA for the input parameters, and initialize them (memory allocation, parameter settings).</simpara>
74447450
____________________________________________________________________________-->
7451+
<!--==========================orignal english content==========================
7452+
<simpara>Declare an SQLDA for the input parameters, and initialize them (memory allocation, parameter settings).</simpara>
7453+
____________________________________________________________________________-->
74457454
<simpara>为输入参数声明一个 SQLDA,并且初始化它们(内存分配、参数设置)。</simpara></step>
74467455
<step><!--==========================orignal english content==========================
74477456
<simpara>Open a cursor with the input SQLDA.</simpara>
74487457
____________________________________________________________________________-->
7458+
<!--==========================orignal english content==========================
7459+
<simpara>Open a cursor with the input SQLDA.</simpara>
7460+
____________________________________________________________________________-->
74497461
<simpara>用输入 SQLDA 打开一个游标。</simpara></step>
74507462
<step><!--==========================orignal english content==========================
74517463
<simpara>Fetch rows from the cursor, and store them into an output SQLDA.</simpara>
74527464
____________________________________________________________________________-->
7465+
<!--==========================orignal english content==========================
7466+
<simpara>Fetch rows from the cursor, and store them into an output SQLDA.</simpara>
7467+
____________________________________________________________________________-->
74537468
<simpara>从游标中取得行,并且把它们存储到一个输出 SQLDA。</simpara></step>
74547469
<step><!--==========================orignal english content==========================
74557470
<simpara>Read values from the output SQLDA into the host variables (with conversion if necessary).</simpara>
74567471
____________________________________________________________________________-->
7472+
<!--==========================orignal english content==========================
7473+
<simpara>Read values from the output SQLDA into the host variables (with conversion if necessary).</simpara>
7474+
____________________________________________________________________________-->
74577475
<simpara>从输出 SQLDA 读取值到主变量中(必要时使用转换)。</simpara></step>
74587476
<step><!--==========================orignal english content==========================
74597477
<simpara>Close the cursor.</simpara>
74607478
____________________________________________________________________________-->
7479+
<!--==========================orignal english content==========================
7480+
<simpara>Close the cursor.</simpara>
7481+
____________________________________________________________________________-->
74617482
<simpara>关闭游标。</simpara></step>
74627483
<step><!--==========================orignal english content==========================
74637484
<simpara>Free the memory area allocated for the input SQLDA.</simpara>
74647485
____________________________________________________________________________-->
7486+
<!--==========================orignal english content==========================
7487+
<simpara>Free the memory area allocated for the input SQLDA.</simpara>
7488+
____________________________________________________________________________-->
74657489
<simpara>关闭为输入 SQLDA 分配的内存区域。</simpara></step>
74667490
</procedure>
74677491

@@ -7915,26 +7939,44 @@ ____________________________________________________________________________-->
79157939
<step><!--==========================orignal english content==========================
79167940
<simpara>Declare an <type>sqlda_t</type> structure to receive the result set.</simpara>
79177941
____________________________________________________________________________-->
7942+
<!--==========================orignal english content==========================
7943+
<simpara>Declare an <type>sqlda_t</type> structure to receive the result set.</simpara>
7944+
____________________________________________________________________________-->
79187945
<simpara>声明一个<type>sqlda_t</type>结构来接收结果集。</simpara></step>
79197946
<step><!--==========================orignal english content==========================
79207947
<simpara>Execute <command>FETCH</command>/<command>EXECUTE</command>/<command>DESCRIBE</command> commands to process a query specifying the declared SQLDA.</simpara>
79217948
____________________________________________________________________________-->
7949+
<!--==========================orignal english content==========================
7950+
<simpara>Execute <command>FETCH</command>/<command>EXECUTE</command>/<command>DESCRIBE</command> commands to process a query specifying the declared SQLDA.</simpara>
7951+
____________________________________________________________________________-->
79227952
<simpara>执行 <command>FETCH</command>/<command>EXECUTE</command>/<command>DESCRIBE</command> 命令来处理一个指定已声明 SQLDA 的查询。</simpara></step>
79237953
<step><!--==========================orignal english content==========================
79247954
<simpara>Check the number of records in the result set by looking at <structfield>sqln</structfield>, a member of the <type>sqlda_t</type> structure.</simpara>
79257955
____________________________________________________________________________-->
7956+
<!--==========================orignal english content==========================
7957+
<simpara>Check the number of records in the result set by looking at <structfield>sqln</structfield>, a member of the <type>sqlda_t</type> structure.</simpara>
7958+
____________________________________________________________________________-->
79267959
<simpara>通过查看<type>sqlda_t</type>结构的成员<structfield>sqln</structfield>来检查结果集中记录的数量。</simpara></step>
79277960
<step><!--==========================orignal english content==========================
79287961
<simpara>Get the values of each column from <literal>sqlvar[0]</literal>, <literal>sqlvar[1]</literal>, etc., members of the <type>sqlda_t</type> structure.</simpara>
79297962
____________________________________________________________________________-->
7963+
<!--==========================orignal english content==========================
7964+
<simpara>Get the values of each column from <literal>sqlvar[0]</literal>, <literal>sqlvar[1]</literal>, etc., members of the <type>sqlda_t</type> structure.</simpara>
7965+
____________________________________________________________________________-->
79307966
<simpara>从<type>sqlda_t</type>结构的成员<literal>sqlvar[0]</literal>、<literal>sqlvar[1]</literal>等中得到每一列的值。</simpara></step>
79317967
<step><!--==========================orignal english content==========================
79327968
<simpara>Go to next row (<type>sqlda_t</type> structure) by following the <structfield>desc_next</structfield> pointer, a member of the <type>sqlda_t</type> structure.</simpara>
79337969
____________________________________________________________________________-->
7970+
<!--==========================orignal english content==========================
7971+
<simpara>Go to next row (<type>sqlda_t</type> structure) by following the <structfield>desc_next</structfield> pointer, a member of the <type>sqlda_t</type> structure.</simpara>
7972+
____________________________________________________________________________-->
79347973
<simpara>沿着<type>sqlda_t</type>结构的成员<structfield>desc_next</structfield>指针到达下一行(<type>sqlda_t</type>)。</simpara></step>
79357974
<step><!--==========================orignal english content==========================
79367975
<simpara>Repeat above as you need.</simpara>
79377976
____________________________________________________________________________-->
7977+
<!--==========================orignal english content==========================
7978+
<simpara>Repeat above as you need.</simpara>
7979+
____________________________________________________________________________-->
79387980
<simpara>根据你的需要重复上述步骤。</simpara></step>
79397981
</procedure>
79407982

@@ -8103,22 +8145,37 @@ ____________________________________________________________________________-->
81038145
<step><!--==========================orignal english content==========================
81048146
<simpara>Create a prepared query (prepared statement)</simpara>
81058147
____________________________________________________________________________-->
8148+
<!--==========================orignal english content==========================
8149+
<simpara>Create a prepared query (prepared statement)</simpara>
8150+
____________________________________________________________________________-->
81068151
<simpara>创建一个预备查询(预备语句)。</simpara></step>
81078152
<step><!--==========================orignal english content==========================
81088153
<simpara>Declare an sqlda_t structure as an input SQLDA.</simpara>
81098154
____________________________________________________________________________-->
8155+
<!--==========================orignal english content==========================
8156+
<simpara>Declare an sqlda_t structure as an input SQLDA.</simpara>
8157+
____________________________________________________________________________-->
81108158
<simpara>声明一个 sqlda_t 结构作为输入 SQLDA。</simpara></step>
81118159
<step><!--==========================orignal english content==========================
81128160
<simpara>Allocate memory area (as sqlda_t structure) for the input SQLDA.</simpara>
81138161
____________________________________________________________________________-->
8162+
<!--==========================orignal english content==========================
8163+
<simpara>Allocate memory area (as sqlda_t structure) for the input SQLDA.</simpara>
8164+
____________________________________________________________________________-->
81148165
<simpara>为输入 SQLDA 分配内存区域(作为 sqlda_t 结构)。</simpara></step>
81158166
<step><!--==========================orignal english content==========================
81168167
<simpara>Set (copy) input values in the allocated memory.</simpara>
81178168
____________________________________________________________________________-->
8169+
<!--==========================orignal english content==========================
8170+
<simpara>Set (copy) input values in the allocated memory.</simpara>
8171+
____________________________________________________________________________-->
81188172
<simpara>在分配好的内存中设置(复制)输入值。</simpara></step>
81198173
<step><!--==========================orignal english content==========================
81208174
<simpara>Open a cursor with specifying the input SQLDA.</simpara>
81218175
____________________________________________________________________________-->
8176+
<!--==========================orignal english content==========================
8177+
<simpara>Open a cursor with specifying the input SQLDA.</simpara>
8178+
____________________________________________________________________________-->
81228179
<simpara>打开一个说明了输入 SQLDA 的游标。</simpara></step>
81238180
</procedure>
81248181

postgresql/doc/src/sgml/extend.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ ____________________________________________________________________________-->
10871087

10881088
<!--==========================orignal english content==========================
10891089
<para>
1090-
The <xref linkend="sql-createextension"/> command relies on a control
1090+
The <command>CREATE EXTENSION</command> command relies on a control
10911091
file for each extension, which must be named the same as the extension
10921092
with a suffix of <literal>.control</literal>, and must be placed in the
10931093
installation's <literal>SHAREDIR/extension</literal> directory. There

postgresql/doc/src/sgml/func.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26841,7 +26841,7 @@ ____________________________________________________________________________-->
2684126841
</para>
2684226842

2684326843
<!--==========================orignal english content==========================
26844-
<para>
26844+
<para>
2684526845
The second argument must be a well formed XML document. In particular,
2684626846
it must have a single root node element.
2684726847
</para>

0 commit comments

Comments
 (0)