Skip to content

Commit 8d2ec75

Browse files
ChenHuajunChenHuajun
authored
Merge pull request #251 from ChenHuajun/master
翻译10.2->11.2 xplang.sgml xml2.sgml test-decoding.sgml tcn.sgml sslinf…
2 parents 6fc95b3 + 1f4ef2f commit 8d2ec75

File tree

6 files changed

+28
-33
lines changed

6 files changed

+28
-33
lines changed

‎postgresql/doc/src/sgml/sourcerepo.sgml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ ____________________________________________________________________________-->
7373
<step>
7474
<!--==========================orignal english content==========================
7575
<para>
76-
You will need an installed version of <productname>Git</>, which you can
77-
get from <ulink url="http://git-scm.com"></ulink>. Many systems already
78-
have a recent version of <application>Git</> installed by default, or
76+
You will need an installed version of <productname>Git</application>, which you can
77+
get from <ulink url="https://git-scm.com"></ulink>. Many systems already
78+
have a recent version of <application>Git</application> installed by default, or
7979
available in their package distribution system.
8080
</para>
8181
____________________________________________________________________________-->
8282
<para>
83-
你将需要一个已安装的<productname>Git</productname>版本，你可以从<ulink url="http://git-scm.com"></ulink>得到。很多系统已经默认安装了一个最近版本的<application>Git</application>，或者可以从它们的包发布系统中找到。
83+
你将需要一个已安装的<productname>Git</productname>版本，你可以从<ulink url="https://git-scm.com"></ulink>得到。很多系统已经默认安装了一个最近版本的<application>Git</application>，或者可以从它们的包发布系统中找到。
8484
</para>
8585
</step>
8686

@@ -90,7 +90,7 @@ ____________________________________________________________________________-->
9090
To begin using the Git repository, make a clone of the official mirror:
9191

9292
<programlisting>
93-
git clone git://git.postgresql.org/git/postgresql.git
93+
git clone https://git.postgresql.org/git/postgresql.git
9494
</programlisting>
9595

9696
This will copy the full repository to your local machine, so it may take
@@ -103,34 +103,29 @@ ____________________________________________________________________________-->
103103
要开始使用 Git 仓库，先做一个官方镜像的克隆：
104104

105105
<programlisting>
106-
git clone git://git.postgresql.org/git/postgresql.git
106+
git clone https://git.postgresql.org/git/postgresql.git
107107
</programlisting>
108108

109109
这将复制整个仓库到你的本地机器上，这样它会花上一会儿来完成（特别是如果你使用的互联网连接速度较慢）。文件将被放在你当前目录下的一个新子目录<filename>postgresql</filename>中。
110110
</para>
111111

112112
<!--==========================orignal english content==========================
113113
<para>
114-
The Git mirror can also be reached via the HTTP protocol, if for example
115-
a firewall is blocking access to the Git protocol. Just change the URL
116-
prefix to <literal>https</>, as in:
114+
The Git mirror can also be reached via the Git protocol, Just change the URL
115+
prefix to <literal>git</>, as in:
117116

118117
<programlisting>
119118
git clone https://git.postgresql.org/git/postgresql.git
120119
</programlisting>
121-
122-
The HTTP protocol is less efficient than the Git protocol, so it will be
123-
slower to use.
124120
</para>
125121
____________________________________________________________________________-->
126122
<para>
127-
Git 镜像也可以通过 HTTP 协议访问，例如一个防火墙屏蔽 Git 协议访问时可以使用 HTTP。只需要将 URL 前缀改成<literal>https</literal>：
123+
Git 镜像也可以通过 Git 协议访问。只需要将 URL 前缀改成<literal>git</literal>：
128124

129125
<programlisting>
130126
git clone https://git.postgresql.org/git/postgresql.git
131127
</programlisting>
132128

133-
HTTP 协议效率不如 Git 协议，因此它用起来很慢。
134129
</para>
135130
</step>
136131

@@ -159,11 +154,11 @@ git fetch
159154
<para>
160155
<productname>Git</> can do a lot more things than just fetch the source. For
161156
more information, consult the <productname>Git</> man pages, or see the
162-
website at <ulink url="http://git-scm.com"></>.
157+
website at <ulink url="https://git-scm.com"></>.
163158
</para>
164159
____________________________________________________________________________-->
165160
<para>
166-
除了取得源码，<productname>Git</productname>可以做更多事情。要了解更多，请参考<productname>Git</productname>手册页，或者访问网站<ulink url="http://git-scm.com"></ulink>。
161+
除了取得源码，<productname>Git</productname>可以做更多事情。要了解更多，请参考<productname>Git</productname>手册页，或者访问网站<ulink url="https://git-scm.com"></ulink>。
167162
</para>
168163
</sect1>
169164

‎postgresql/doc/src/sgml/sslinfo.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ ____________________________________________________________________________-->
6262
<listitem>
6363
<!--==========================orignal english content==========================
6464
<para>
65-
Returns TRUE if current connection to server uses SSL, and FALSE
65+
Returns true if current connection to server uses SSL, and false
6666
otherwise.
6767
</para>
6868
____________________________________________________________________________-->
6969
<para>
70-
如果当前到服务器的连接使用 SSL 则返回 TRUE，否则返回 FALSE。
70+
如果当前到服务器的连接使用 SSL 则返回 true，否则返回 false。
7171
</para>
7272
</listitem>
7373
</varlistentry>
@@ -146,13 +146,13 @@ ____________________________________________________________________________-->
146146
<listitem>
147147
<!--==========================orignal english content==========================
148148
<para>
149-
Returns TRUE if current client has presented a valid SSL client
150-
certificate to the server, and FALSE otherwise. (The server
149+
Returns true if current client has presented a valid SSL client
150+
certificate to the server, and false otherwise. (The server
151151
might or might not be configured to require a client certificate.)
152152
</para>
153153
____________________________________________________________________________-->
154154
<para>
155-
如果当前客户端已经向服务器出示了一个合法的 SSL 客户端证书则返回 TRUE，否则返回 FALSE（服务器可能被配置要求一个客户端配置，也可能没有被配置成这样）。
155+
如果当前客户端已经向服务器出示了一个合法的 SSL 客户端证书则返回 true，否则返回 false（服务器可能被配置要求一个客户端配置，也可能没有被配置成这样）。
156156
</para>
157157
</listitem>
158158
</varlistentry>
@@ -280,12 +280,12 @@ ____________________________________________________________________________-->
280280
<!--==========================orignal english content==========================
281281
<para>
282282
This function is really useful only if you have more than one trusted CA
283-
certificate in your server's <filename>root.crt</> file, or if this CA
283+
certificate in your server's certificate authority file, or if this CA
284284
has issued some intermediate certificate authority certificates.
285285
</para>
286286
____________________________________________________________________________-->
287287
<para>
288-
如果在服务器的<filename>root.crt</filename>文件中有多于一个的可信 CA 证书，或者如果 CAI 已经发行了某些中间认证授权证书，这个函数就真的很有用。
288+
如果在服务器的证书授权中心文件中有多于一个的可信 CA 证书，或者如果 CAI 已经发行了某些中间认证授权证书，这个函数就真的很有用。
289289
</para>
290290
</listitem>
291291
</varlistentry>

‎postgresql/doc/src/sgml/tcn.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ test(# );
7676
CREATE TABLE
7777
test=# create trigger tcndata_tcn_trigger
7878
test-# after insert or update or delete on tcndata
79-
test-# for each row execute procedure triggered_change_notification();
79+
test-# for each row execute function triggered_change_notification();
8080
CREATE TRIGGER
8181
test=# listen tcn;
8282
LISTEN
@@ -111,7 +111,7 @@ test(# );
111111
CREATE TABLE
112112
test=# create trigger tcndata_tcn_trigger
113113
test-# after insert or update or delete on tcndata
114-
test-# for each row execute procedure triggered_change_notification();
114+
test-# for each row execute function triggered_change_notification();
115115
CREATE TRIGGER
116116
test=# listen tcn;
117117
LISTEN

‎postgresql/doc/src/sgml/test-decoding.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ____________________________________________________________________________-->
1919
<para>
2020
<filename>test_decoding</> is an example of a logical decoding
2121
output plugin. It doesn't do anything especially useful, but can serve as
22-
a starting point for developing your own decoder.
22+
a starting point for developing your own output plugin.
2323
</para>
2424
____________________________________________________________________________-->
2525
<para>
2626
<filename>test_decoding</filename>是一个逻辑解码输出插件的例子。它其实不做
27-
任何特别有用的事情，但是可以作为开发你自己的解码器的起点。
27+
任何特别有用的事情，但是可以作为开发你自己的输出插件的起点。
2828
</para>
2929

3030
<!--==========================orignal english content==========================

‎postgresql/doc/src/sgml/xml2.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ ____________________________________________________________________________-->
4242
you are encouraged to try converting your applications. If you
4343
find that some of the functionality of this module is not
4444
available in an adequate form with the newer API, please explain
45-
your issue to <email>pgsql-hackers@postgresql.org</email> so that the deficiency
45+
your issue to <email>pgsql-hackers@lists.postgresql.org</email> so that the deficiency
4646
can be addressed.
4747
</para>
4848
____________________________________________________________________________-->
4949
<para>
50-
从<productname>PostgreSQL</productname> 8.3 开始，在核心服务器中就已经有基于 SQL/XML 标准的 XML 相关功能。那些功能覆盖了 XML 语法检查和 XPath 查询，这些本模块也能做，但是其 API 并不是完全兼容。这个模块已经有计划将从 PostgreSQL 的一个未来版本中移除，因此我们鼓励你尝试转换你的应用。如果你发现这个模块的某些功能在更新的 API 中没有合适的形式相对应，请向<email>pgsql-hackers@postgresql.org</email>表达你的问题，这样该缺点会被进行改进。
50+
从<productname>PostgreSQL</productname> 8.3 开始，在核心服务器中就已经有基于 SQL/XML 标准的 XML 相关功能。那些功能覆盖了 XML 语法检查和 XPath 查询，这些本模块也能做，但是其 API 并不是完全兼容。这个模块已经有计划将从 PostgreSQL 的一个未来版本中移除，因此我们鼓励你尝试转换你的应用。如果你发现这个模块的某些功能在更新的 API 中没有合适的形式相对应，请向<email>pgsql-hackers@lists.postgresql.org</email>表达你的问题，这样该缺点会被进行改进。
5151
</para>
5252
</sect2>
5353

‎postgresql/doc/src/sgml/xplang.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <re
234234
the language does not grant access to data that the user would
235235
not otherwise have. Trusted languages are designed for ordinary
236236
database users (those without superuser privilege) and allows them
237-
to safely create functions and trigger
237+
to safely create functions and
238238
procedures. Since PL functions are executed inside the database
239239
server, the <literal>TRUSTED</literal> flag should only be given
240240
for languages that do not allow access to database server
@@ -258,7 +258,7 @@ CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <re
258258
<optional>INLINE <replaceable>inline_function_name</replaceable></optional>
259259
<optional>VALIDATOR <replaceable>validator_function_name</replaceable></optional> ;
260260
</synopsis>
261-
可选的关键词<literal>TRUSTED</literal>指定，如果用户不具有访问数据的权限，该语言不会授予对数据的访问。可信的语言是为普通数据库用户（没有超级用户特权）设计的并且允许他们安全地创建函数和触发器过程。由于 PL 函数是在数据库内部执行的，<literal>TRUSTED</literal>标志只应被给予不允许访问数据库服务器内部或文件系统的语言。语言
261+
可选的关键词<literal>TRUSTED</literal>指定，如果用户不具有访问数据的权限，该语言不会授予对数据的访问。可信的语言是为普通数据库用户（没有超级用户特权）设计的并且允许他们安全地创建函数和过程。由于 PL 函数是在数据库内部执行的，<literal>TRUSTED</literal>标志只应被给予不允许访问数据库服务器内部或文件系统的语言。语言
262262
<application>PL/pgSQL</application>、
263263
<application>PL/Tcl</application>以及
264264
<application>PL/Perl</application>被认为是可信的，语言
@@ -343,7 +343,7 @@ CREATE TRUSTED PROCEDURAL LANGUAGE plperl
343343
VALIDATOR plperl_validator;
344344
</programlisting>
345345
then defines that the previously declared functions
346-
should be invoked for functions and trigger procedures where the
346+
should be invoked for functions and procedures where the
347347
language attribute is <literal>plperl</literal>.
348348
</para>
349349
____________________________________________________________________________-->
@@ -355,7 +355,7 @@ CREATE TRUSTED PROCEDURAL LANGUAGE plperl
355355
INLINE plperl_inline_handler
356356
VALIDATOR plperl_validator;
357357
</programlisting>
358-
则定义了前面声明的函数会为语言属性为<literal>plperl</literal>的函数及触发器过程所调用。
358+
则定义了前面声明的函数会为语言属性为<literal>plperl</literal>的函数及过程所调用。
359359
</para>
360360
</example>
361361

0 commit comments

Comments
 (0)