Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit5b0aa11

Browse files
committed
Doc: update section 9.12 for new function table layout.
Also rearrange that page a bit for more consistency and lessduplication.In passing, fix erroneous examples of the results of abbrev(cidr)in datatype.sgml, and do a bit of copy-editing there.
1 parentab7646f commit5b0aa11

File tree

2 files changed

+510
-410
lines changed

2 files changed

+510
-410
lines changed

‎doc/src/sgml/datatype.sgml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2854,7 +2854,7 @@ SELECT EXTRACT(days from '80 hours'::interval);
28542854
<entry><literal>iso_8601</literal></entry>
28552855
<entry>P1Y2M</entry>
28562856
<entry>P3DT4H5M6S</entry>
2857-
<entry>P-1Y-2M3DT-4H-5M-6S</entry>
2857+
<entry>P-1Y-2M3D&zwsp;T-4H-5M-6S</entry>
28582858
</row>
28592859
</tbody>
28602860
</tgroup>
@@ -3559,8 +3559,9 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
35593559
<replaceable class="parameter">y</replaceable>
35603560
is the number of bits in the netmask. If the
35613561
<replaceable class="parameter">/y</replaceable>
3562-
portion is missing, the
3563-
netmask is 32 for IPv4 and 128 for IPv6, so the value represents
3562+
portion is omitted, the
3563+
netmask is taken to be 32 for IPv4 or 128 for IPv6,
3564+
so the value represents
35643565
just a single host. On display, the
35653566
<replaceable class="parameter">/y</replaceable>
35663567
portion is suppressed if the netmask specifies a single host.
@@ -3580,7 +3581,8 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
35803581
conventions.
35813582
The format for specifying networks is <replaceable
35823583
class="parameter">address/y</replaceable> where <replaceable
3583-
class="parameter">address</replaceable> is the network represented as an
3584+
class="parameter">address</replaceable> is the network's lowest
3585+
address represented as an
35843586
IPv4 or IPv6 address, and <replaceable
35853587
class="parameter">y</replaceable> is the number of bits in the netmask. If
35863588
<replaceable class="parameter">y</replaceable> is omitted, it is calculated
@@ -3668,12 +3670,12 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
36683670
<row>
36693671
<entry>2001:4f8:3:ba::/64</entry>
36703672
<entry>2001:4f8:3:ba::/64</entry>
3671-
<entry>2001:4f8:3:ba::/64</entry>
3673+
<entry>2001:4f8:3:ba/64</entry>
36723674
</row>
36733675
<row>
3674-
<entry>2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128</entry>
3675-
<entry>2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128</entry>
3676-
<entry>2001:4f8:3:ba:2e0:81ff:fe22:d1f1</entry>
3676+
<entry>2001:4f8:3:ba:&zwsp;2e0:81ff:fe22:d1f1/128</entry>
3677+
<entry>2001:4f8:3:ba:&zwsp;2e0:81ff:fe22:d1f1/128</entry>
3678+
<entry>2001:4f8:3:ba:&zwsp;2e0:81ff:fe22:d1f1/128</entry>
36773679
</row>
36783680
<row>
36793681
<entry>::ffff:1.2.3.0/120</entry>
@@ -3738,7 +3740,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
37383740
<member><literal>'08002b010203'</literal></member>
37393741
</simplelist>
37403742

3741-
These exampleswouldall specify the same address. Upper and
3743+
These examples all specify the same address. Upper and
37423744
lower case is accepted for the digits
37433745
<literal>a</literal> through <literal>f</literal>. Output is always in the
37443746
first of the forms shown.
@@ -3805,14 +3807,17 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
38053807
<member><literal>'08002b0102030405'</literal></member>
38063808
</simplelist>
38073809

3808-
These exampleswouldall specify the same address. Upper and
3810+
These examples all specify the same address. Upper and
38093811
lower case is accepted for the digits
38103812
<literal>a</literal> through <literal>f</literal>. Output is always in the
38113813
first of the forms shown.
3814+
</para>
38123815

3813-
The last six input formats that are mentioned above are not part
3814-
of any standard.
3816+
<para>
3817+
The last six input formats shown above are not part of any standard.
3818+
</para>
38153819

3820+
<para>
38163821
To convert a traditional 48 bit MAC address in EUI-48 format to
38173822
modified EUI-64 format to be included as the host portion of an
38183823
IPv6 address, use <function>macaddr8_set7bit</function> as shown:
@@ -4655,7 +4660,8 @@ SELECT * FROM pg_attribute
46554660
<entry><type>regoperator</type></entry>
46564661
<entry><structname>pg_operator</structname></entry>
46574662
<entry>operator with argument types</entry>
4658-
<entry><literal>*(integer,integer)</literal> or <literal>-(NONE,integer)</literal></entry>
4663+
<entry><literal>*(integer,&zwsp;integer)</literal>
4664+
or <literal>-(NONE,&zwsp;integer)</literal></entry>
46594665
</row>
46604666

46614667
<row>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp