Skip to content

Commit 7fd6674

Browse files
ChenHuajunChenHuajun
authored
Merge pull request #255 from Steve888888/master
 翻译 ref/drop_function.sgml 等 11.2文档
2 parents 29cbf6c + a5922b2 commit 7fd6674

13 files changed

+853
-730
lines changed

‎postgresql/doc/src/sgml/install-windows.sgml

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

‎postgresql/doc/src/sgml/isn.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ ____________________________________________________________________________-->
674674

675675
The prefixes used for hyphenation were also compiled from:
676676
<itemizedlist>
677-
<listitem><para><ulink url="http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html"></ulink></para></listitem>
677+
<listitem><para><ulink url="https://www.gs1.org/standards/id-keys"></ulink></para></listitem>
678678
<listitem><para><ulink url="http://en.wikipedia.org/wiki/List_of_ISBN_identifier_groups"></ulink></para></listitem>
679679
<listitem><para><ulink url="https://www.isbn-international.org/content/isbn-users-manual"></ulink></para></listitem>
680680
<listitem><para><ulink url="http://en.wikipedia.org/wiki/International_Standard_Music_Number"></ulink></para></listitem>
@@ -689,19 +689,19 @@ ____________________________________________________________________________-->
689689
<para>
690690
实现这个模块的信息可以从下列网站收集到：
691691
<itemizedlist>
692-
<listitem><para><ulink url="http://www.isbn-international.org/"></ulink></para></listitem>
692+
<listitem><para><ulink url="https://www.isbn-international.org/"></ulink></para></listitem>
693693
<listitem><para><ulink url="http://www.issn.org/"></ulink></para></listitem>
694-
<listitem><para><ulink url="http://www.ismn-international.org/"></ulink></para></listitem>
695-
<listitem><para><ulink url="http://www.wikipedia.org/"></ulink></para></listitem>
694+
<listitem><para><ulink url="https://www.ismn-international.org/"></ulink></para></listitem>
695+
<listitem><para><ulink url="https://www.wikipedia.org/"></ulink></para></listitem>
696696
</itemizedlist>
697697

698698
用于连接的前缀：
699699
<itemizedlist>
700-
<listitem><para><ulink url="http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html"></ulink></para></listitem>
701-
<listitem><para><ulink url="http://en.wikipedia.org/wiki/List_of_ISBN_identifier_groups"></ulink></para></listitem>
700+
<listitem><para><ulink url="https://www.gs1.org/standards/id-keys"></ulink></para></listitem>
701+
<listitem><para><ulink url="https://en.wikipedia.org/wiki/List_of_ISBN_identifier_groups"></ulink></para></listitem>
702702
<listitem><para><ulink url="https://www.isbn-international.org/content/isbn-users-manual"></ulink></para></listitem>
703-
<listitem><para><ulink url="http://en.wikipedia.org/wiki/International_Standard_Music_Number"></ulink></para></listitem>
704-
<listitem><para><ulink url="http://www.ismn-international.org/ranges.html"></ulink></para></listitem>
703+
<listitem><para><ulink url="https://en.wikipedia.org/wiki/International_Standard_Music_Number"></ulink></para></listitem>
704+
<listitem><para><ulink url="https://www.ismn-international.org/ranges.html"></ulink></para></listitem>
705705
</itemizedlist>
706706

707707
创建算法时已经注意严谨地使用 ISBN、ISMN、ISSN 官方用户手册中的推荐算法进行了验证。

‎postgresql/doc/src/sgml/ltree.sgml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ ____________________________________________________________________________-->
6565
</para>
6666
____________________________________________________________________________-->
6767
<para>
68-
一个<firstterm>标签路径</firstterm>是由点号分隔的零个或者更多个标签的序列，例如<literal>L1.L2.L3</literal>，它表示一个从层次树的根到一个特定节点的路径。一个标签路径的长度必须小于 65kB，但是最好将它保持在 2kB 以下。实际上这不是一个主要限制，例如在 DMOZ 目录（<ulink
69-
url="http://www.dmoz.org"></ulink>）中最长的标签路径大约是 240 字节。
68+
一个<firstterm>标签路径</firstterm>是由点号分隔的零个或者更多个标签的序列，例如<literal>L1.L2.L3</literal>，它表示一个从层次树的根到一个特定节点的路径。一个标签路径的长度必须小于 65kB，但是最好将它保持在 2kB 以下。
7069
</para>
7170

7271
<!--==========================orignal english content==========================
@@ -890,34 +889,34 @@ ____________________________________________________________________________-->
890889
<row>
891890
<entry><function>lca(ltree, ltree, ...)</function><indexterm><primary>lca</primary></indexterm></entry>
892891
<entry><type>ltree</type></entry>
893-
<entry>lowest common ancestor, i.e., longest common prefix of paths
892+
<entry>longest common ancestor of paths
894893
(up to 8 arguments supported)</entry>
895-
<entry><literal>lca('1.2.2.3','1.2.3.4.5.6')</literal></entry>
894+
<entry><literal>lca('1.2.3','1.2.3.4.5.6')</literal></entry
896895
<entry><literal>1.2</literal></entry>
897896
</row>
898897
____________________________________________________________________________-->
899898
<row>
900899
<entry><function>lca(ltree, ltree, ...)</function><indexterm><primary>lca</primary></indexterm></entry>
901900
<entry><type>ltree</type></entry>
902-
<entry>最低公共祖先，即最长的公共路径前缀（最多支持 8 个参数）</entry>
903-
<entry><literal>lca('1.2.2.3','1.2.3.4.5.6')</literal></entry>
901+
<entry>路径的最长公共祖先（最多支持 8 个参数）</entry>
902+
<entry><literal>lca('1.2.3','1.2.3.4.5.6')</literal></entry
904903
<entry><literal>1.2</literal></entry>
905904
</row>
906905

907906
<!--==========================orignal english content==========================
908907
<row>
909908
<entry><function>lca(ltree[])</function></entry>
910909
<entry><type>ltree</type></entry>
911-
<entry>lowest common ancestor, i.e., longest common prefix of paths</entry>
912-
<entry><literal>lca(array['1.2.2.3'::ltree,'1.2.3'])</literal></entry>
910+
<entry>longest common ancestor of paths in array</entry>
911+
<entry><literal>lca(array['1.2.3'::ltree,'1.2.3.4'])</literal></entry>
913912
<entry><literal>1.2</literal></entry>
914913
</row>
915914
____________________________________________________________________________-->
916915
<row>
917916
<entry><function>lca(ltree[])</function></entry>
918917
<entry><type>ltree</type></entry>
919-
<entry>最低公共祖先，即最长的公共路径前缀</entry>
920-
<entry><literal>lca(array['1.2.2.3'::ltree,'1.2.3'])</literal></entry>
918+
<entry>数组中路径的最长公共祖先</entry>
919+
<entry><literal>lca(array['1.2.3'::ltree,'1.2.3.4'])</literal></entry>
921920
<entry><literal>1.2</literal></entry>
922921
</row>
923922

‎postgresql/doc/src/sgml/maintenance.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ ____________________________________________________________________________-->
15331533

15341534
<!--==========================orignal english content==========================
15351535
<para>
1536-
<ulink url="http://dalibo.github.io/pgbadger/"><productname>pgBadger</productname></ulink>
1536+
<ulink url="https://pgbadger.darold.net/"><productname>pgBadger</productname></ulink>
15371537
is an external project that does sophisticated log file analysis.
15381538
<ulink
15391539
url="https://bucardo.org/check_postgres/"><productname>check_postgres</productname></ulink>
@@ -1542,7 +1542,7 @@ ____________________________________________________________________________-->
15421542
</para>
15431543
____________________________________________________________________________-->
15441544
<para>
1545-
<ulink url="http://dalibo.github.io/pgbadger/"><productname>pgBadger</productname></ulink>是一个外部项目，它可以进行日志文件的深度分析。
1545+
<ulink url="https://pgbadger.darold.net/"><productname>pgBadger</productname></ulink>是一个外部项目，它可以进行日志文件的深度分析。
15461546
<ulink
15471547
url="https://bucardo.org/check_postgres/"><productname>check_postgres</productname></ulink>可在重要消息出现在日志文件中时向Nagios提供警告，也可以探测很多其他的特别情况。
15481548
</para>

‎postgresql/doc/src/sgml/pgrowlocks.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ ____________________________________________________________________________-->
146146
</row>
147147
<!--==========================orignal english content==========================
148148
<row>
149-
<entry><structfield>lock_type</structfield></entry>
149+
<entry><structfield>modes</structfield></entry>
150150
<entry><type>text[]</type></entry>
151151
<entry>Lock mode of lockers (more than one if multitransaction),
152152
an array of <literal>Key Share</>, <literal>Share</>,
@@ -155,7 +155,7 @@ ____________________________________________________________________________-->
155155
</row>
156156
____________________________________________________________________________-->
157157
<row>
158-
<entry><structfield>lock_type</structfield></entry>
158+
<entry><structfield>modes</structfield></entry>
159159
<entry><type>text[]</type></entry>
160160
<entry>持锁者的锁模式（如果是多事务则多于一个），是一个<literal>Key Share</literal>、<literal>Share</literal>、<literal>For No Key Update</literal>、<literal>No Key Update</literal>、<literal>For Update</literal>、<literal>Update</literal>组成的数组。</entry>
161161
</row>
@@ -249,23 +249,23 @@ ____________________________________________________________________________-->
249249
<!--==========================orignal english content==========================
250250
<screen>
251251
test=# SELECT * FROM pgrowlocks('t1');
252-
locked_row | lock_type | locker | multi | xids | pids
252+
locked_row | locker | multi | xids | modes | pids
253253
-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;+-&minus;-&minus;-&minus;-&minus;-&minus;-+-&minus;-&minus;-&minus;-&minus;+-&minus;-&minus;-&minus;-+-&minus;-&minus;-&minus;-&minus;-&minus;-+-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-
254-
(0,1) | Shared | 19 | t | {804,805} | {29066,29068}
255-
(0,2) | Shared | 19 | t | {804,805} | {29066,29068}
256-
(0,3) | Exclusive | 804 | f | {804} | {29066}
257-
(0,4) | Exclusive | 804 | f | {804} | {29066}
254+
(0,1) | 609 | f | {609} | {"For Share"} | {3161}
255+
(0,2) | 609 | f | {609} | {"For Share"} | {3161}
256+
(0,3) | 607 | f | {607} | {"For Update"} | {3107}
257+
(0,4) | 607 | f | {607} | {"For Update"} | {3107}
258258
(4 rows)
259259
</screen>
260260
____________________________________________________________________________-->
261261
<screen>
262-
test=# SELECT * FROM pgrowlocks('t1');
263-
locked_row | lock_type | locker | multi | xids | pids
264-
------------+-----------+--------+-------+-----------+---------------
265-
(0,1) | Shared | 19 | t | {804,805} | {29066,29068}
266-
(0,2) | Shared | 19 | t | {804,805} | {29066,29068}
267-
(0,3) | Exclusive | 804 | f | {804} | {29066}
268-
(0,4) | Exclusive | 804 | f | {804} | {29066}
262+
=# SELECT * FROM pgrowlocks('t1');
263+
locked_row | locker | multi | xids | modes | pids
264+
------------+--------+-------+-------+----------------+--------
265+
(0,1) | 609 | f | {609} | {"For Share"} | {3161}
266+
(0,2) | 609 | f | {609} | {"For Share"} | {3161}
267+
(0,3) | 607 | f | {607} | {"For Update"} | {3107}
268+
(0,4) | 607 | f | {607} | {"For Update"} | {3107}
269269
(4 rows)
270270
</screen>
271271
</sect2>

‎postgresql/doc/src/sgml/pgstattuple.sgml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@ ____________________________________________________________________________-->
2727

2828
<!--==========================orignal english content==========================
2929
<para>
30-
As these functions return detailed page-level information, only the superuser
31-
has EXECUTE privileges on them upon installation. After the functions have
32-
been installed, users may issue <command>GRANT</command> commands to change
33-
the privileges on the functions to allow non-superusers to execute them. Members
34-
of the <literal>pg_stat_scan_tables</literal> role are granted access by default. See
35-
the description of the <xref linkend="sql-grant"> command for specifics.
30+
Because these functions return detailed page-level information, access is
31+
restricted by default. By default, only the
32+
role <literal>pg_stat_scan_tables</literal> has <literal>EXECUTE</literal>
33+
privilege. Superusers of course bypass this restriction. After the
34+
extension has been installed, users may issue <command>GRANT</command>
35+
commands to change the privileges on the functions to allow others to
36+
execute them. However, it might be preferable to add those users to
37+
the <literal>pg_stat_scan_tables</literal> role instead.
3638
</para>
3739
____________________________________________________________________________-->
3840
<para>
39-
由于这些函数返回详细的页面级信息，因此只有超级用户在安装时才具有EXECUTE特权。
40-
在安装函数之后，用户可以发出<command>GRANT</command>命令来更改函数的权限，
41-
以允许非超级用户执行它们。默认情况下，<literal>pg_stat_scan_tables</literal>
42-
角色的成员被授予访问权限。有关详细信息，请参阅<xref linkend="sql-grant"/>命令的描述。
41+
由于这些函数返回详细的页面级信息，因此默认访问权限是受限制的。 默认情况下，只有角色<literal>pg_stat_scan_tables</literal>具有<literal>EXECUTE</literal>特权。 超级用户当然可以绕过这个限制。扩展程序安装后,用户可以发送<command>GRANT</command>命令来更改函数的权限以允许其他用户来执行它们。但是，最好将这些用户添加到<literal>pg_stat_scan_tables</literal>角色。
4342
</para>
4443

4544
<sect2>

‎postgresql/doc/src/sgml/ref/alter_large_object.sgml

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

6-
<refentry id="SQL-ALTERLARGEOBJECT">
6+
<refentry id="sql-alterlargeobject">
77
<!--==========================orignal english content==========================
88
<indexterm zone="sql-alterlargeobject">
99
<primary>ALTER LARGE OBJECT</primary>
@@ -57,17 +57,26 @@ ____________________________________________________________________________-->
5757
<!--==========================orignal english content==========================
5858
<para>
5959
<command>ALTER LARGE OBJECT</command> changes the definition of a
60-
large object. The only functionality is to assign a new owner.
61-
You must be superuser or owner of the large object to use
62-
<command>ALTER LARGE OBJECT</command>.
60+
large object.
6361
</para>
6462
____________________________________________________________________________-->
6563
<para>
6664
<command>ALTER LARGE OBJECT</command>更改一个大对象的定义。
67-
唯一的功能是为它赋予一个新的拥有者。要使用
68-
<command>ALTER LARGE OBJECT</command>，你必须是超级用户或者
69-
该大对象的拥有者。
7065
</para>
66+
<!--==========================orignal english content==========================
67+
<para>
68+
You must own the large object to use <command>ALTER LARGE OBJECT</command>.
69+
To alter the owner, you must also be a direct or indirect member of the new
70+
owning role. (However, a superuser can alter any large object anyway.)
71+
Currently, the only functionality is to assign a new owner, so both
72+
restrictions always apply.
73+
</para>
74+
____________________________________________________________________________-->
75+
76+
<para>
77+
您必须拥有大对象才能使用<command>ALTER LARGE OBJECT</command>。要更改所有者，您还必须是新所有者的直接或间接成员。（不过，超级用户仍然可以更改任何大对象。)当前，唯一的功能是分配新所有者，因此两者的约束都始终适用。
78+
</para>
79+
7180
</refsect1>
7281

7382
<refsect1>

‎postgresql/doc/src/sgml/ref/alter_user.sgml

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

6-
<refentry id="SQL-ALTERUSER">
6+
<refentry id="sql-alteruser">
77
<!--==========================orignal english content==========================
8-
<indexterm zone="sql-alteruser">
8+
<refentry id="sql-alteruser">
99
<primary>ALTER USER</primary>
1010
</indexterm>
1111
____________________________________________________________________________-->
@@ -52,7 +52,7 @@ ALTER USER <replaceable class="parameter">role_specification</replaceable> [ WIT
5252
| REPLICATION | NOREPLICATION
5353
| BYPASSRLS | NOBYPASSRLS
5454
| CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
55-
| [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
55+
| [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' | PASSWORD NULL
5656
| VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
5757

5858
ALTER USER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
@@ -82,7 +82,7 @@ ALTER USER <replaceable class="parameter">role_specification</replaceable> [ WIT
8282
| REPLICATION | NOREPLICATION
8383
| BYPASSRLS | NOBYPASSRLS
8484
| CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
85-
| [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
85+
| [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>' | PASSWORD NULL
8686
| VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
8787

8888
ALTER USER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>

0 commit comments

Comments
 (0)