Skip to content

Commit f619a08

Browse files
authored
Merge pull request #262 from ChenHuajun/master
翻译security_label.sgml等PG11剩余部分
2 parents 177179b + 4b0a46f commit f619a08

13 files changed

+81
-89
lines changed

postgresql/doc/src/sgml/contrib.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ CREATE EXTENSION <replaceable>module_name</replaceable>;
122122
choice. To do that, add <literal>SCHEMA
123123
<replaceable>schema_name</></literal> to the <command>CREATE EXTENSION</>
124124
command. By default, the objects will be placed in your current creation
125-
target schema, typically <literal>public</>.
125+
target schema, which in turn defaults to <literal>public</literal>.
126126
</para>
127127
____________________________________________________________________________-->
128128
<para>

postgresql/doc/src/sgml/dml.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ INSERT INTO products (product_no, name, price)
206206
<tip>
207207
<!--==========================orignal english content==========================
208208
<para>
209-
When inserting a lot of data at the same time, considering using
209+
When inserting a lot of data at the same time, consider using
210210
the <xref linkend="sql-copy"> command.
211211
It is not as flexible as the <xref linkend="sql-insert">
212212
command, but is more efficient. Refer

postgresql/doc/src/sgml/lo.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,17 @@ ____________________________________________________________________________-->
117117

118118
<!--==========================orignal english content==========================
119119
<programlisting>
120-
CREATE TABLE image (title TEXT, raster lo);
120+
CREATE TABLE image (title text, raster lo);
121121

122122
CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
123-
FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
123+
FOR EACH ROW EXECUTE FUNCTION lo_manage(raster);
124124
</programlisting>
125125
____________________________________________________________________________-->
126126
<programlisting>
127-
CREATE TABLE image (title TEXT, raster lo);
127+
CREATE TABLE image (title text, raster lo);
128128

129129
CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
130-
FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
130+
FOR EACH ROW EXECUTE FUNCTION lo_manage(raster);
131131
</programlisting>
132132

133133
<!--==========================orignal english content==========================

postgresql/doc/src/sgml/nls.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ ____________________________________________________________________________-->
233233
can also be named
234234
<filename><replaceable>language</replaceable>_<replaceable>region</replaceable>.po</filename>
235235
where <replaceable>region</replaceable> is the
236-
<ulink url="http://www.iso.org/iso/country_names_and_code_elements">
236+
<ulink url="https://www.iso.org/iso-3166-country-codes.html">
237237
ISO 3166-1 two-letter country code (in upper case)</ulink>,
238238
e.g.,
239239
<filename>pt_BR.po</filename> for Portuguese in Brazil. If you
@@ -244,7 +244,7 @@ ____________________________________________________________________________-->
244244
<para>
245245
如果已经有某些<filename>.po</filename>文件,那么有些人已经完成了一些翻译工作。这些文件被命名为<filename><replaceable>语言</replaceable>.po</filename>,其中<replaceable>语言</replaceable>是<ulink url="http://www.loc.gov/standards/iso639-2/php/English_list.php">
246246
ISO 639-1 双字符语言代码(小写形式)</ulink>,例如法语是<filename>fr.po</filename>。如果真的对于一种语言有需要多个翻译任务那么这些文件也可以被命名为<filename><replaceable>语言</replaceable>_<replaceable>区域</replaceable>.po</filename>,其中<replaceable>region</replaceable>是
247-
<ulink url="http://www.iso.org/iso/country_names_and_code_elements">
247+
<ulink url="https://www.iso.org/iso-3166-country-codes.html">
248248
ISO 3166-1 双字符国家代码(大写形式)</ulink>,例如巴西的葡萄牙语是<filename>pt_BR.po</filename>。如果你找到了你想要的语言,你就可以开始在那个文件上工作了。
249249
</para>
250250

postgresql/doc/src/sgml/passwordcheck.sgml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ ____________________________________________________________________________-->
1919
<para>
2020
The <filename>passwordcheck</filename> module checks users' passwords
2121
whenever they are set with
22-
<xref linkend="SQL-CREATEROLE"> or
22+
<xref linkend="sql-createrole"/> or
2323
<xref linkend="SQL-ALTERROLE">.
2424
If a password is considered too weak, it will be rejected and
2525
the command will terminate with an error.
2626
</para>
2727
____________________________________________________________________________-->
2828
<para>
29-
只要通过<xref linkend="SQL-CREATEROLE"/>或<xref linkend="SQL-ALTERROLE"/>设置用户,<filename>passwordcheck</filename>模块会检查用户的口令。如果一个口令被认为太弱,它将被拒绝并且该命令将带着一个错误终止。
29+
只要通过<xref linkend="sql-createrole"/>或<xref linkend="sql-alterrole"/>设置用户,
30+
<filename>passwordcheck</filename>模块会检查用户的口令。如果一个口令被认为太弱,它将被拒绝并且该命令将带着一个错误终止。
3031
</para>
3132

3233
<!--==========================orignal english content==========================
@@ -44,7 +45,7 @@ ____________________________________________________________________________-->
4445
<para>
4546
You can adapt this module to your needs by changing the source code.
4647
For example, you can use
47-
<ulink url="http://sourceforge.net/projects/cracklib/">CrackLib</ulink>
48+
<ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>
4849
to check passwords &mdash; this only requires uncommenting
4950
two lines in the <filename>Makefile</filename> and rebuilding the
5051
module. (We cannot include <productname>CrackLib</productname>
@@ -55,7 +56,7 @@ ____________________________________________________________________________-->
5556
</para>
5657
____________________________________________________________________________-->
5758
<para>
58-
你可以通过修改源代码来按你的需要修改这个模块。例如,你可以使用<ulink url="http://sourceforge.net/projects/cracklib/">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块(由于授权原因,我们不能默认包括<productname>CrackLib</productname>)。如果没有<productname>CrackLib</productname>,该模块会对口令强度强制一些简单的规则,你可以自行修改和扩充。
59+
你可以通过修改源代码来按你的需要修改这个模块。例如,你可以使用<ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块(由于授权原因,我们不能默认包括<productname>CrackLib</productname>)。如果没有<productname>CrackLib</productname>,该模块会对口令强度强制一些简单的规则,你可以自行修改和扩充。
5960
</para>
6061

6162
<caution>

postgresql/doc/src/sgml/ref/comment.sgml

Lines changed: 21 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ doc/src/sgml/ref/comment.sgml
33
PostgreSQL documentation
44
-->
55

6-
<refentry id="SQL-COMMENT">
6+
<refentry id="sql-comment">
77
<!--==========================orignal english content==========================
88
<indexterm zone="sql-comment">
99
<primary>COMMENT</primary>
@@ -65,8 +65,10 @@ COMMENT ON
6565
OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
6666
POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
6767
[ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
68+
PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
6869
PUBLICATION <replaceable class="parameter">object_name</replaceable> |
6970
ROLE <replaceable class="parameter">object_name</replaceable> |
71+
ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
7072
RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
7173
SCHEMA <replaceable class="parameter">object_name</replaceable> |
7274
SEQUENCE <replaceable class="parameter">object_name</replaceable> |
@@ -95,45 +97,6 @@ ____________________________________________________________________________-->
9597
<synopsis>
9698
COMMENT ON
9799
{
98-
ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
99-
AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
100-
CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
101-
COLLATION <replaceable class="parameter">object_name</replaceable> |
102-
COLUMN <replaceable class="parameter">relation_name</replaceable>.<replaceable class="parameter">column_name</replaceable> |
103-
CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
104-
CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON DOMAIN <replaceable class="parameter">domain_name</replaceable> |
105-
CONVERSION <replaceable class="parameter">object_name</replaceable> |
106-
DATABASE <replaceable class="parameter">object_name</replaceable> |
107-
DOMAIN <replaceable class="parameter">object_name</replaceable> |
108-
EXTENSION <replaceable class="parameter">object_name</replaceable> |
109-
EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> |
110-
FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> |
111-
FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> |
112-
FUNCTION <replaceable class="parameter">function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) |
113-
INDEX <replaceable class="parameter">object_name</replaceable> |
114-
LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> |
115-
MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> |
116-
OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) |
117-
OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
118-
OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
119-
POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
120-
[ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
121-
ROLE <replaceable class="parameter">object_name</replaceable> |
122-
RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
123-
SCHEMA <replaceable class="parameter">object_name</replaceable> |
124-
SEQUENCE <replaceable class="parameter">object_name</replaceable> |
125-
SERVER <replaceable class="parameter">object_name</replaceable> |
126-
TABLE <replaceable class="parameter">object_name</replaceable> |
127-
TABLESPACE <replaceable class="parameter">object_name</replaceable> |
128-
TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> |
129-
TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> |
130-
TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> |
131-
TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> |
132-
TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
133-
TRIGGER <replaceable class="parameter">trigger_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
134-
TYPE <replaceable class="parameter">object_name</replaceable> |
135-
VIEW <replaceable class="parameter">object_name</replaceable>
136-
} IS '<replaceable class="parameter">text</replaceable>'
137100
ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
138101
AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
139102
CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
@@ -157,8 +120,10 @@ COMMENT ON
157120
OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
158121
POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
159122
[ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
123+
PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
160124
PUBLICATION <replaceable class="parameter">object_name</replaceable> |
161125
ROLE <replaceable class="parameter">object_name</replaceable> |
126+
ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
162127
RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
163128
SCHEMA <replaceable class="parameter">object_name</replaceable> |
164129
SEQUENCE <replaceable class="parameter">object_name</replaceable> |
@@ -291,6 +256,14 @@ ____________________________________________________________________________-->
291256
<term><replaceable class="parameter">policy_name</replaceable></term>
292257
____________________________________________________________________________-->
293258
<term><replaceable class="parameter">policy_name</replaceable></term>
259+
<!--==========================orignal english content==========================
260+
<term><replaceable class="parameter">procedure_name</replaceable></term>
261+
____________________________________________________________________________-->
262+
<term><replaceable class="parameter">procedure_name</replaceable></term>
263+
<!--==========================orignal english content==========================
264+
<term><replaceable class="parameter">routine_name</replaceable></term>
265+
____________________________________________________________________________-->
266+
<term><replaceable class="parameter">routine_name</replaceable></term>
294267
<!--==========================orignal english content==========================
295268
<term><replaceable class="parameter">rule_name</replaceable></term>
296269
____________________________________________________________________________-->
@@ -304,7 +277,7 @@ ____________________________________________________________________________-->
304277
<para>
305278
The name of the object to be commented. Names of tables,
306279
aggregates, collations, conversions, domains, foreign tables, functions,
307-
indexes, operators, operator classes, operator families, sequences,
280+
indexes, operators, operator classes, operator families, procedures, routines, sequences,
308281
statistics, text search objects, types, and views can be
309282
schema-qualified. When commenting on a column,
310283
<replaceable class="parameter">relation_name</replaceable> must refer
@@ -313,7 +286,7 @@ ____________________________________________________________________________-->
313286
____________________________________________________________________________-->
314287
<para>
315288
要被注释的对象的名称。表、聚集、排序方式、转换、域、外部表、函数、
316-
索引、操作符、操作符类、操作符族、序列、统计信息、文本搜索对象、类型和视图
289+
索引、操作符、操作符类、操作符族、存储过程、例程、序列、统计信息、文本搜索对象、类型和视图
317290
的名称可以被模式限定。在注释一列时,
318291
<replaceable class="parameter">relation_name</replaceable>必须
319292
引用一个表、视图、组合类型或者外部表。
@@ -387,7 +360,7 @@ ____________________________________________________________________________-->
387360
<listitem>
388361
<!--==========================orignal english content==========================
389362
<para>
390-
The mode of a function or aggregate
363+
The mode of a function, procedure, or aggregate
391364
argument: <literal>IN</>, <literal>OUT</>,
392365
<literal>INOUT</>, or <literal>VARIADIC</>.
393366
If omitted, the default is <literal>IN</>.
@@ -399,7 +372,7 @@ ____________________________________________________________________________-->
399372
</para>
400373
____________________________________________________________________________-->
401374
<para>
402-
一个函数或者聚集的参数的模式:<literal>IN</literal>、
375+
一个函数,存储过程或者聚集函数的参数的模式:<literal>IN</literal>、
403376
<literal>OUT</literal>、<literal>INOUT</literal>或者<literal>VARIADIC</literal>。
404377
如果被省略,默认值是<literal>IN</literal>。注意
405378
<command>COMMENT</command>并不真正关心
@@ -425,7 +398,7 @@ ____________________________________________________________________________-->
425398
</para>
426399
____________________________________________________________________________-->
427400
<para>
428-
一个函数或者聚集参数的名称。注意
401+
一个函数,存储过程或者聚集函数参数的名称。注意
429402
<command>COMMENT</command>并不真正关心参数名称,
430403
因为决定函数的身份只需要参数数据类型。
431404
</para>
@@ -444,7 +417,7 @@ ____________________________________________________________________________-->
444417
</para>
445418
____________________________________________________________________________-->
446419
<para>
447-
一个函数或者聚集参数的数据类型
420+
一个函数,存储过程或者聚集函数参数的数据类型
448421
</para>
449422
</listitem>
450423
</varlistentry>
@@ -652,6 +625,7 @@ COMMENT ON OPERATOR - (NONE, integer) IS 'Unary minus';
652625
COMMENT ON OPERATOR CLASS int4ops USING btree IS '4 byte integer operators for btrees';
653626
COMMENT ON OPERATOR FAMILY integer_ops USING btree IS 'all integer operators for btrees';
654627
COMMENT ON POLICY my_policy ON mytable IS 'Filter rows by users';
628+
COMMENT ON PROCEDURE my_proc (integer, integer) IS 'Runs a report';
655629
COMMENT ON ROLE my_role IS 'Administration group for finance tables';
656630
COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
657631
COMMENT ON SCHEMA my_schema IS 'Departmental data';
@@ -697,6 +671,7 @@ COMMENT ON OPERATOR - (NONE, integer) IS 'Unary minus';
697671
COMMENT ON OPERATOR CLASS int4ops USING btree IS '4 byte integer operators for btrees';
698672
COMMENT ON OPERATOR FAMILY integer_ops USING btree IS 'all integer operators for btrees';
699673
COMMENT ON POLICY my_policy ON mytable IS 'Filter rows by users';
674+
COMMENT ON PROCEDURE my_proc (integer, integer) IS 'Runs a report';
700675
COMMENT ON ROLE my_role IS 'Administration group for finance tables';
701676
COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
702677
COMMENT ON SCHEMA my_schema IS 'Departmental data';

postgresql/doc/src/sgml/ref/create_language.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_language.sgml
33
PostgreSQL documentation
44
-->
55

6-
<refentry id="SQL-CREATELANGUAGE">
6+
<refentry id="sql-createlanguage">
77
<!--==========================orignal english content==========================
88
<indexterm zone="sql-createlanguage">
99
<primary>CREATE LANGUAGE</primary>
@@ -62,14 +62,14 @@ ____________________________________________________________________________-->
6262
<para>
6363
<command>CREATE LANGUAGE</command> registers a new
6464
procedural language with a <productname>PostgreSQL</productname>
65-
database. Subsequently, functions and trigger procedures can be
65+
database. Subsequently, functions and procedures can be
6666
defined in this new language.
6767
</para>
6868
____________________________________________________________________________-->
6969
<para>
7070
<command>CREATE LANGUAGE</command>为一个
7171
<productname>PostgreSQL</productname>数据库注册一种新的
72-
过程语言。接着,可以用这种新语言定义函数和触发器过程
72+
过程语言。接着,可以用这种新语言定义函数和存储过程
7373
</para>
7474

7575
<note>

0 commit comments

Comments
 (0)