Merge pull request #262 from ChenHuajun/master

翻译security_label.sgml等PG11剩余部分

Author: ChenHuajun

postgresql/doc/src/sgml/contrib.sgml

@@ -122,7 +122,7 @@ CREATE EXTENSION <replaceable>module_name</replaceable>;
   choice.  To do that, add <literal>SCHEMA
   <replaceable>schema_name</></literal> to the <command>CREATE EXTENSION</>
   command.  By default, the objects will be placed in your current creation
-  target schema, typically <literal>public</>.
+  target schema, which in turn defaults to <literal>public</literal>.
  </para>
 ____________________________________________________________________________-->
  <para>

postgresql/doc/src/sgml/dml.sgml

@@ -206,7 +206,7 @@ INSERT INTO products (product_no, name, price)
   <tip>
 <!--==========================orignal english content==========================
    <para>
-    When inserting a lot of data at the same time, considering using
+    When inserting a lot of data at the same time, consider using
     the <xref linkend="sql-copy"> command.
     It is not as flexible as the <xref linkend="sql-insert">
     command, but is more efficient. Refer

postgresql/doc/src/sgml/lo.sgml

@@ -117,17 +117,17 @@ ____________________________________________________________________________-->
 
 <!--==========================orignal english content==========================
 <programlisting>
-CREATE TABLE image (title TEXT, raster lo);
+CREATE TABLE image (title text, raster lo);
 
 CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
-    FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
+    FOR EACH ROW EXECUTE FUNCTION lo_manage(raster);
 </programlisting>
 ____________________________________________________________________________-->
 <programlisting>
-CREATE TABLE image (title TEXT, raster lo);
+CREATE TABLE image (title text, raster lo);
 
 CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
-    FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
+    FOR EACH ROW EXECUTE FUNCTION lo_manage(raster);
 </programlisting>
 
 <!--==========================orignal english content==========================

postgresql/doc/src/sgml/nls.sgml

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

postgresql/doc/src/sgml/passwordcheck.sgml

@@ -19,14 +19,15 @@ ____________________________________________________________________________-->
  <para>
   The <filename>passwordcheck</filename> module checks users' passwords
   whenever they are set with
-  <xref linkend="SQL-CREATEROLE"> or
+  <xref linkend="sql-createrole"/> or
   <xref linkend="SQL-ALTERROLE">.
   If a password is considered too weak, it will be rejected and
   the command will terminate with an error.
  </para>
 ____________________________________________________________________________-->
  <para>
-  只要通过<xref linkend="SQL-CREATEROLE"/>或<xref linkend="SQL-ALTERROLE"/>设置用户，<filename>passwordcheck</filename>模块会检查用户的口令。如果一个口令被认为太弱，它将被拒绝并且该命令将带着一个错误终止。
+  只要通过<xref linkend="sql-createrole"/>或<xref linkend="sql-alterrole"/>设置用户，
+  <filename>passwordcheck</filename>模块会检查用户的口令。如果一个口令被认为太弱，它将被拒绝并且该命令将带着一个错误终止。
  </para>
 
 <!--==========================orignal english content==========================
@@ -44,7 +45,7 @@ ____________________________________________________________________________-->
  <para>
   You can adapt this module to your needs by changing the source code.
   For example, you can use
-  <ulink url="http://sourceforge.net/projects/cracklib/">CrackLib</ulink>
+  <ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>
   to check passwords &mdash; this only requires uncommenting
   two lines in the <filename>Makefile</filename> and rebuilding the
   module.  (We cannot include <productname>CrackLib</productname>
@@ -55,7 +56,7 @@ ____________________________________________________________________________-->
  </para>
 ____________________________________________________________________________-->
  <para>
-  你可以通过修改源代码来按你的需要修改这个模块。例如，你可以使用<ulink url="http://sourceforge.net/projects/cracklib/">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块（由于授权原因，我们不能默认包括<productname>CrackLib</productname>）。如果没有<productname>CrackLib</productname>，该模块会对口令强度强制一些简单的规则，你可以自行修改和扩充。
+  你可以通过修改源代码来按你的需要修改这个模块。例如，你可以使用<ulink url="https://sourceforge.net/projects/cracklib/">CrackLib</ulink>来检查口令 &mdash; 这只需要在<filename>Makefile</filename>中取消两行的注释并且重新编译该模块（由于授权原因，我们不能默认包括<productname>CrackLib</productname>）。如果没有<productname>CrackLib</productname>，该模块会对口令强度强制一些简单的规则，你可以自行修改和扩充。
  </para>
 
  <caution>

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

@@ -3,7 +3,7 @@ doc/src/sgml/ref/comment.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-COMMENT">
+<refentry id="sql-comment">
 <!--==========================orignal english content==========================
  <indexterm zone="sql-comment">
   <primary>COMMENT</primary>
@@ -65,8 +65,10 @@ COMMENT ON
   OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
   POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
   [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
+  PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
   PUBLICATION <replaceable class="parameter">object_name</replaceable> |
   ROLE <replaceable class="parameter">object_name</replaceable> |
+  ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
   RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
   SCHEMA <replaceable class="parameter">object_name</replaceable> |
   SEQUENCE <replaceable class="parameter">object_name</replaceable> |
@@ -95,45 +97,6 @@ ____________________________________________________________________________-->
 <synopsis>
 COMMENT ON
 {
-  ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
-  AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
-  CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
-  COLLATION <replaceable class="parameter">object_name</replaceable> |
-  COLUMN <replaceable class="parameter">relation_name</replaceable>.<replaceable class="parameter">column_name</replaceable> |
-  CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
-  CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON DOMAIN <replaceable class="parameter">domain_name</replaceable> |
-  CONVERSION <replaceable class="parameter">object_name</replaceable> |
-  DATABASE <replaceable class="parameter">object_name</replaceable> |
-  DOMAIN <replaceable class="parameter">object_name</replaceable> |
-  EXTENSION <replaceable class="parameter">object_name</replaceable> |
-  EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> |
-  FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> |
-  FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> |
-  FUNCTION <replaceable class="parameter">function_name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) |
-  INDEX <replaceable class="parameter">object_name</replaceable> |
-  LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> |
-  MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> |
-  OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) |
-  OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
-  [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
-  ROLE <replaceable class="parameter">object_name</replaceable> |
-  RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
-  SCHEMA <replaceable class="parameter">object_name</replaceable> |
-  SEQUENCE <replaceable class="parameter">object_name</replaceable> |
-  SERVER <replaceable class="parameter">object_name</replaceable> |
-  TABLE <replaceable class="parameter">object_name</replaceable> |
-  TABLESPACE <replaceable class="parameter">object_name</replaceable> |
-  TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> |
-  TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> |
-  TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> |
-  TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> |
-  TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
-  TRIGGER <replaceable class="parameter">trigger_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
-  TYPE <replaceable class="parameter">object_name</replaceable> |
-  VIEW <replaceable class="parameter">object_name</replaceable>
-} IS '<replaceable class="parameter">text</replaceable>'
   ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
   AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
   CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
@@ -157,8 +120,10 @@ COMMENT ON
   OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
   POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
   [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
+  PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
   PUBLICATION <replaceable class="parameter">object_name</replaceable> |
   ROLE <replaceable class="parameter">object_name</replaceable> |
+  ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
   RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
   SCHEMA <replaceable class="parameter">object_name</replaceable> |
   SEQUENCE <replaceable class="parameter">object_name</replaceable> |
@@ -291,6 +256,14 @@ ____________________________________________________________________________-->
     <term><replaceable class="parameter">policy_name</replaceable></term>
 ____________________________________________________________________________-->
     <term><replaceable class="parameter">policy_name</replaceable></term>
+<!--==========================orignal english content==========================
+    <term><replaceable class="parameter">procedure_name</replaceable></term>
+____________________________________________________________________________-->
+    <term><replaceable class="parameter">procedure_name</replaceable></term>
+<!--==========================orignal english content==========================
+    <term><replaceable class="parameter">routine_name</replaceable></term>
+____________________________________________________________________________-->
+    <term><replaceable class="parameter">routine_name</replaceable></term>
 <!--==========================orignal english content==========================
     <term><replaceable class="parameter">rule_name</replaceable></term>
 ____________________________________________________________________________-->
@@ -304,7 +277,7 @@ ____________________________________________________________________________-->
      <para>
       The name of the object to be commented.  Names of tables,
       aggregates, collations, conversions, domains, foreign tables, functions,
-      indexes, operators, operator classes, operator families, sequences,
+      indexes, operators, operator classes, operator families, procedures, routines, sequences,
       statistics, text search objects, types, and views can be
       schema-qualified. When commenting on a column,
       <replaceable class="parameter">relation_name</replaceable> must refer
@@ -313,7 +286,7 @@ ____________________________________________________________________________-->
 ____________________________________________________________________________-->
      <para>
       要被注释的对象的名称。表、聚集、排序方式、转换、域、外部表、函数、
-      索引、操作符、操作符类、操作符族、序列、统计信息、文本搜索对象、类型和视图
+      索引、操作符、操作符类、操作符族、存储过程、例程、序列、统计信息、文本搜索对象、类型和视图
       的名称可以被模式限定。在注释一列时，
       <replaceable class="parameter">relation_name</replaceable>必须
       引用一个表、视图、组合类型或者外部表。
@@ -387,7 +360,7 @@ ____________________________________________________________________________-->
     <listitem>
 <!--==========================orignal english content==========================
      <para>
-      The mode of a function or aggregate
+      The mode of a function, procedure, or aggregate
       argument: <literal>IN</>, <literal>OUT</>,
       <literal>INOUT</>, or <literal>VARIADIC</>.
       If omitted, the default is <literal>IN</>.
@@ -399,7 +372,7 @@ ____________________________________________________________________________-->
      </para>
 ____________________________________________________________________________-->
      <para>
-      一个函数或者聚集的参数的模式：<literal>IN</literal>、
+      一个函数，存储过程或者聚集函数的参数的模式：<literal>IN</literal>、
       <literal>OUT</literal>、<literal>INOUT</literal>或者<literal>VARIADIC</literal>。
       如果被省略，默认值是<literal>IN</literal>。注意
       <command>COMMENT</command>并不真正关心
@@ -425,7 +398,7 @@ ____________________________________________________________________________-->
      </para>
 ____________________________________________________________________________-->
      <para>
-      一个函数或者聚集参数的名称。注意
+      一个函数，存储过程或者聚集函数参数的名称。注意
       <command>COMMENT</command>并不真正关心参数名称，
       因为决定函数的身份只需要参数数据类型。
      </para>
@@ -444,7 +417,7 @@ ____________________________________________________________________________-->
      </para>
 ____________________________________________________________________________-->
      <para>
-      一个函数或者聚集参数的数据类型。
+      一个函数，存储过程或者聚集函数参数的数据类型。
      </para>
     </listitem>
    </varlistentry>
@@ -652,6 +625,7 @@ COMMENT ON OPERATOR - (NONE, integer) IS 'Unary minus';
 COMMENT ON OPERATOR CLASS int4ops USING btree IS '4 byte integer operators for btrees';
 COMMENT ON OPERATOR FAMILY integer_ops USING btree IS 'all integer operators for btrees';
 COMMENT ON POLICY my_policy ON mytable IS 'Filter rows by users';
+COMMENT ON PROCEDURE my_proc (integer, integer) IS 'Runs a report';
 COMMENT ON ROLE my_role IS 'Administration group for finance tables';
 COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
 COMMENT ON SCHEMA my_schema IS 'Departmental data';
@@ -697,6 +671,7 @@ COMMENT ON OPERATOR - (NONE, integer) IS 'Unary minus';
 COMMENT ON OPERATOR CLASS int4ops USING btree IS '4 byte integer operators for btrees';
 COMMENT ON OPERATOR FAMILY integer_ops USING btree IS 'all integer operators for btrees';
 COMMENT ON POLICY my_policy ON mytable IS 'Filter rows by users';
+COMMENT ON PROCEDURE my_proc (integer, integer) IS 'Runs a report';
 COMMENT ON ROLE my_role IS 'Administration group for finance tables';
 COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
 COMMENT ON SCHEMA my_schema IS 'Departmental data';

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

@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_language.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATELANGUAGE">
+<refentry id="sql-createlanguage">
 <!--==========================orignal english content==========================
  <indexterm zone="sql-createlanguage">
   <primary>CREATE LANGUAGE</primary>
@@ -62,14 +62,14 @@ ____________________________________________________________________________-->
   <para>
    <command>CREATE LANGUAGE</command> registers a new
    procedural language with a <productname>PostgreSQL</productname>
-   database.  Subsequently, functions and trigger procedures can be
+   database.  Subsequently, functions and procedures can be
    defined in this new language.
   </para>
 ____________________________________________________________________________-->
   <para>
    <command>CREATE LANGUAGE</command>为一个
    <productname>PostgreSQL</productname>数据库注册一种新的
-   过程语言。接着，可以用这种新语言定义函数和触发器过程。
+   过程语言。接着，可以用这种新语言定义函数和存储过程。
   </para>
 
   <note>