Skip to content

Commit a314564

Browse files
committed
重新更新注释,fix不匹配错误
1 parent 5d14c6f commit a314564

File tree

7 files changed

+3277
-788
lines changed

7 files changed

+3277
-788
lines changed

postgresql/doc/src/sgml/information_schema.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8492,7 +8492,7 @@ ____________________________________________________________________________-->
84928492
<structfield>is_grantable</structfield> <type>yes_or_no</type>
84938493
</para>
84948494
<para>
8495-
<literal>如果该特权是可授予的,则为<literal>YES</literal>,否则为<literal>NO</literal>
8495+
如果该特权是可授予的,则为<literal>YES</literal>,否则为<literal>NO</literal>
84968496
</para></entry>
84978497
</row>
84988498
</tbody>
@@ -9590,7 +9590,7 @@ ____________________________________________________________________________-->
95909590
<structfield>is_grantable</structfield> <type>yes_or_no</type>
95919591
</para>
95929592
<para>
9593-
如果该特权是可授予的,则为<literal>YES</literal>,否则为<literal>NO</literal></entry>
9593+
如果该特权是可授予的,则为<literal>YES</literal>,否则为<literal>NO</literal>
95949594
</para></entry>
95959595
</row>
95969596
</tbody>

postgresql/doc/src/sgml/installation.sgml

Lines changed: 697 additions & 762 deletions
Large diffs are not rendered by default.

postgresql/doc/src/sgml/intarray.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ ____________________________________________________________________________-->
413413
<tgroup cols="1">
414414
<thead>
415415
<!--==========================orignal english content==========================
416+
<row>
416417
<entry role="func_table_entry"><para role="func_signature">
417418
Operator
418419
</para>
@@ -605,7 +606,6 @@ ____________________________________________________________________________-->
605606
Removes elements of the right array from the left array.
606607
</para></entry>
607608
</row>
608-
609609
____________________________________________________________________________-->
610610
<row>
611611
<entry role="func_table_entry"><para role="func_signature">

postgresql/doc/src/sgml/ref/prepare.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ ____________________________________________________________________________-->
335335
</para>
336336
</refsect1>
337337

338-
<refsect1 id="sql-prepare-examples">
338+
<refsect1 id="sql-prepare-examples" xreflabel="Examples">
339339
<!--==========================orignal english content==========================
340340
<title>Examples</title>
341341
____________________________________________________________________________-->

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

Lines changed: 2559 additions & 1 deletion
Large diffs are not rendered by default.

postgresql/doc/src/sgml/syntax.sgml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ ____________________________________________________________________________-->
893893
<para>
894894
要在一个字符串中包括一个表示其字面意思的转义字符,把它写两次。
895895
</para>
896-
<!--==========================orignal english content==========================
896+
<!--==========================orignal english content==========================
897897
<para>
898898
Either the 4-digit or the 6-digit escape form can be used to
899899
specify UTF-16 surrogate pairs to compose characters with code
@@ -906,7 +906,7 @@ ____________________________________________________________________________-->
906906
<para>
907907
4位或6位转义形式可用于指定UTF-16代理项对,以组成代码点大于U+FFFF的字符,尽管从技术上讲,6位形式的可用性使得这是不必要的(代理项对不是直接存储的,而是合并到单个代码点中。)
908908
</para>
909-
<!--==========================orignal english content==========================
909+
<!--==========================orignal english content==========================
910910
<para>
911911
If the server encoding is not UTF-8, the Unicode code point identified
912912
by one of these escape sequences is converted to the actual server
@@ -916,22 +916,6 @@ ____________________________________________________________________________-->
916916
<para>
917917
如果服务器编码不是 UTF-8,则由这些转义序列之一标识的 Unicode 代码点将转换为实际的服务器编码; 如果不可能,则会报告错误。
918918
</para>
919-
<!--==========================orignal english content==========================
920-
<para>
921-
Also, the Unicode escape syntax for string constants only works
922-
when the configuration
923-
parameter <xref linkend="guc-standard-conforming-strings"/> is
924-
turned on. This is because otherwise this syntax could confuse
925-
clients that parse the SQL statements to the point that it could
926-
lead to SQL injections and similar security issues. If the
927-
parameter is set to off, this syntax will be rejected with an
928-
error message.
929-
</para>
930-
____________________________________________________________________________-->
931-
<para>
932-
此外,字符串常量的 Unicode 转义语法仅在配置参数 <xref linkend="guc-standard-conforming-strings"/> 开启时才有效。 这是因为否则这种语法可能会混淆解析 SQL 语句的客户端,可能导致 SQL 注入和类似的安全问题。 如果该参数设置为 off,则此语法将被拒绝并显示错误消息。
933-
</para>
934-
935919
<!--==========================orignal english content==========================
936920
<para>
937921
Also, the Unicode escape syntax for string constants only works
@@ -945,7 +929,7 @@ ____________________________________________________________________________-->
945929
</para>
946930
____________________________________________________________________________-->
947931
<para>
948-
还有,只有当配置参数<xref linkend="guc-standard-conforming-strings"/>被打开时,用于字符串常量的 Unicode 转义语法才能工作。这是因为否则这种语法将迷惑客户端中肯地解析 SQL 语句,进而会导致 SQL 注入以及类似的安全性问题。如果这个参数被设置为关闭,这种语法将被拒绝并且报告一个错误消息
932+
此外,字符串常量的 Unicode 转义语法仅在配置参数 <xref linkend="guc-standard-conforming-strings"/> 开启时才有效。 这是因为否则这种语法可能会混淆解析 SQL 语句的客户端,可能导致 SQL 注入和类似的安全问题。 如果该参数设置为 off,则此语法将被拒绝并显示错误消息
949933
</para>
950934
</sect3>
951935

postgresql/doc/src/sgml/typeconv.sgml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ in this query expression:
604604
<screen>
605605
SELECT |/ 40 AS "square root of 40";
606606
square root of 40
607-
-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;
608-
6.324555320336759
607+
-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-
608+
6.324555320336759
609609
(1 row)
610610
</screen>
611611

@@ -1899,6 +1899,18 @@ ____________________________________________________________________________-->
18991899
如果候选类型可以隐式转换为其他类型,但反之不行,则选择其他类型作为新的候选类型。 然后继续考虑剩余的输入。 如果在此过程的任何阶段选择了首选类型,请停止考虑其他输入。
19001900
</para>
19011901
</step>
1902+
1903+
<step performance="required">
1904+
<!--==========================orignal english content==========================
1905+
<para>
1906+
Convert all inputs to the final candidate type. Fail if there is not an
1907+
implicit conversion from a given input type to the candidate type.
1908+
</para>
1909+
____________________________________________________________________________-->
1910+
<para>
1911+
将所有输入转换为最终候选类型。如果没有从给定输入类型到候选类型的隐式转换,则失败。
1912+
</para>
1913+
</step>
19021914
</procedure>
19031915

19041916
<!--==========================orignal english content==========================

0 commit comments

Comments
 (0)