Skip to content

Commit 577fd41

Browse files
author
Thomas G. Lockhart
committed
Remove ZP4, ZP5, ZP6 from docs since the current parser won't accept
time zones with embedded numerals (parsing to a meaninless "ZP 4" instead). Support "SAT" as an Australian time zone if USE_AUSTRALIAN_RULES is defined. Fix units in exposition on Julian calendar (from Lazer Henry I think...)
1 parent 1495f56 commit 577fd41

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

doc/src/sgml/datetime.sgml

+25-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.12 2000/09/29 20:21:33 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.13 2000/10/20 13:57:10 thomas Exp $
33
Date/time details
44
-->
55

@@ -94,14 +94,14 @@ Date/time details
9494
<entry>Central Australia Std Time</entry>
9595
</row>
9696
<row>
97-
<entry>CAST</entry>
97+
<entry>SAST</entry>
9898
<entry>+09:30 </entry>
99-
<entry>Central Australia Std Time</entry>
99+
<entry>South Australia Std Time</entry>
100100
</row>
101101
<row>
102-
<entry>SAT</entry>
103-
<entry>+9:30</entry>
104-
<entry>South Australian Std Time</entry>
102+
<entry>CAST</entry>
103+
<entry>+09:30 </entry>
104+
<entry>Central Australia Std Time</entry>
105105
</row>
106106
<row>
107107
<entry>AWSST</entry>
@@ -223,11 +223,6 @@ Date/time details
223223
<entry>+1:00 </entry>
224224
<entry>Dansk Normal Tid</entry>
225225
</row>
226-
<row>
227-
<entry>DST</entry>
228-
<entry>+1:00 </entry>
229-
<entry>Dansk Standard Time (?)</entry>
230-
</row>
231226
<row>
232227
<entry>FST</entry>
233228
<entry>+1:00 </entry>
@@ -313,11 +308,13 @@ Date/time details
313308
<entry>-4:00 </entry>
314309
<entry>Eastern Daylight Time</entry>
315310
</row>
311+
<!--
316312
<row>
317313
<entry>ZP4</entry>
318314
<entry>-4:00</entry>
319315
<entry>GMT +4 hours</entry>
320316
</row>
317+
-->
321318
<row>
322319
<entry>CDT</entry>
323320
<entry>-5:00 </entry>
@@ -328,11 +325,13 @@ Date/time details
328325
<entry>-5:00 </entry>
329326
<entry>Eastern Standard Time</entry>
330327
</row>
328+
<!--
331329
<row>
332330
<entry>ZP5</entry>
333331
<entry>-5:00</entry>
334332
<entry>GMT +5 hours</entry>
335333
</row>
334+
-->
336335
<row>
337336
<entry>CST</entry>
338337
<entry>-6:00 </entry>
@@ -343,11 +342,13 @@ Date/time details
343342
<entry>-6:00</entry>
344343
<entry>Mountain Daylight Time</entry>
345344
</row>
345+
<!--
346346
<row>
347347
<entry>ZP6</entry>
348348
<entry>-6:00</entry>
349349
<entry>GMT +6 hours</entry>
350350
</row>
351+
-->
351352
<row>
352353
<entry>MST</entry>
353354
<entry>-7:00</entry>
@@ -416,8 +417,11 @@ Date/time details
416417

417418
<para>
418419
If the compiler option USE_AUSTRALIAN_RULES is set
419-
then <literal>CST</literal> and <literal>EST</literal> will be
420-
interpreted using Australian conventions.
420+
then <literal>CST</literal>, <literal>EST</literal>, and
421+
<literal>SAT</literal> will be
422+
interpreted using Australian conventions. Without this option,
423+
<literal>SAT</literal> is interpreted as a noise word indicating
424+
"<literal>Saturday</literal>".
421425

422426
<table tocentry="1">
423427
<title><productname>Postgres</productname> Australian Time Zones</title>
@@ -441,6 +445,11 @@ Date/time details
441445
<entry>+10:00</entry>
442446
<entry>Australian Eastern Standard Time</entry>
443447
</row>
448+
<row>
449+
<entry>SAT</entry>
450+
<entry>+9:30</entry>
451+
<entry>South Australian Std Time</entry>
452+
</row>
444453
</tbody>
445454
</tgroup>
446455
</table>
@@ -652,9 +661,9 @@ Date/time details
652661
Gregorian calendar.
653662

654663
In the Julian calendar, the tropical year is approximated as 365 1/4
655-
days = 365.25 days. This gives an error of 1 day in approximately
656-
128 days.
657-
The accumulating calendar error prompted pope Gregory XIII
664+
days = 365.25 days. This gives an error of about 1 day in
665+
128 years.
666+
The accumulating calendar error prompted Pope Gregory XIII
658667
to reform the calendar in accordance with instructions
659668
from the Council of Trent.
660669
</para>

0 commit comments

Comments
 (0)