Skip to content

Commit 9d95390

Browse files
authored
Merge pull request #341 from oneofsunshine/master
ref/create_index.sgml, ref/create_language.sgml, ref/create_table.sgml
2 parents df77ec5 + a62a3ca commit 9d95390

38 files changed

+3613
-2209
lines changed

postgresql/doc/src/sgml/jit.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ ____________________________________________________________________________-->
281281
<screen>
282282
=# EXPLAIN ANALYZE SELECT SUM(relpages) FROM pg_class;
283283
QUERY PLAN
284-
-------------------------------------------------------------------------------------------------------------
284+
-------------------------------------------------------------------&zwsp;------------------------------------------
285285
Aggregate (cost=16.27..16.29 rows=1 width=8) (actual time=0.303..0.303 rows=1 loops=1)
286286
-> Seq Scan on pg_class (cost=0.00..15.42 rows=342 width=4) (actual time=0.017..0.111 rows=356 loops=1)
287287
Planning Time: 0.116 ms
@@ -294,7 +294,7 @@ ____________________________________________________________________________-->
294294
SET
295295
=# EXPLAIN ANALYZE SELECT SUM(relpages) FROM pg_class;
296296
QUERY PLAN
297-
-------------------------------------------------------------------------------------------------------------
297+
-------------------------------------------------------------------&zwsp;------------------------------------------
298298
Aggregate (cost=16.27..16.29 rows=1 width=8) (actual time=6.049..6.049 rows=1 loops=1)
299299
-> Seq Scan on pg_class (cost=0.00..15.42 rows=342 width=4) (actual time=0.019..0.052 rows=356 loops=1)
300300
Planning Time: 0.133 ms

postgresql/doc/src/sgml/json.sgml

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

postgresql/doc/src/sgml/legal.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<date>2019</date>
44

55
<copyright>
6-
<year>1996-2019</year>
6+
<year>1996&ndash;2020</year>
77
<!--
88
<holder>The PostgreSQL Global Development Group</holder>
99
-->
@@ -17,12 +17,12 @@
1717
<title>版权声明</title>
1818

1919
<para>
20-
<productname>PostgreSQL</productname> is Copyright &copy; 1996-2019
20+
<productname>PostgreSQL</productname> is Copyright &copy; 1996&ndash;2020
2121
by the PostgreSQL Global Development Group.
2222
</para>
2323

2424
<para>
25-
<productname>Postgres95</productname> is Copyright &copy; 1994-5
25+
<productname>Postgres95</productname> is Copyright &copy; 1994&ndash;5
2626
by the Regents of the University of California.
2727
</para>
2828

postgresql/doc/src/sgml/nls.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ____________________________________________________________________________-->
226226
someone has already done some translation work. The files are
227227
named <filename><replaceable>language</replaceable>.po</filename>,
228228
where <replaceable>language</replaceable> is the
229-
<ulink url="http://www.loc.gov/standards/iso639-2/php/English_list.php">
229+
<ulink url="https://www.loc.gov/standards/iso639-2/php/English_list.php">
230230
ISO 639-1 two-letter language code (in lower case)</ulink>, e.g.,
231231
<filename>fr.po</filename> for French. If there is really a need
232232
for more than one translation effort per language then the files
@@ -242,7 +242,7 @@ ____________________________________________________________________________-->
242242
</para>
243243
____________________________________________________________________________-->
244244
<para>
245-
如果已经有某些<filename>.po</filename>文件,那么有些人已经完成了一些翻译工作。这些文件被命名为<filename><replaceable>语言</replaceable>.po</filename>,其中<replaceable>语言</replaceable>是<ulink url="http://www.loc.gov/standards/iso639-2/php/English_list.php">
245+
如果已经有某些<filename>.po</filename>文件,那么有些人已经完成了一些翻译工作。这些文件被命名为<filename><replaceable>语言</replaceable>.po</filename>,其中<replaceable>语言</replaceable>是<ulink url="https://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>是
247247
<ulink url="https://www.iso.org/iso-3166-country-codes.html">
248248
ISO 3166-1 双字符国家代码(大写形式)</ulink>,例如巴西的葡萄牙语是<filename>pt_BR.po</filename>。如果你找到了你想要的语言,你就可以开始在那个文件上工作了。

postgresql/doc/src/sgml/oid2name.sgml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,19 @@ ____________________________________________________________________________-->
428428
<para>
429429
与大多数其他 <productname>PostgreSQL</productname>的实用程序一样,这个实用程序也使用<application>libpq</application> 支持的环境变量 (参见 <xref linkend="libpq-envars"/>)。
430430
</para>
431+
<!--==========================orignal english content==========================
432+
<para>
433+
The environment variable <envar>PG_COLOR</envar> specifies whether to use
434+
color in diagnostic messages. Possible values are
435+
<literal>always</literal>, <literal>auto</literal> and
436+
<literal>never</literal>.
437+
</para>
438+
____________________________________________________________________________-->
439+
<para>
440+
环境变量<envar>PG_COLOR</envar>指定是否在诊断消息中使用颜色。
441+
可能的值是<literal>always</literal>、<literal>auto</literal>和
442+
<literal>never</literal>。
443+
</para>
431444
</refsect1>
432445

433446
<refsect1>

0 commit comments

Comments
 (0)