mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove vestigial references to "zic" in favor of "IANA database".

Browse Source 
Commit b2cbced9e instituted a policy of referring to the timezone database
as the "IANA timezone database" in our user-facing documentation.
Propagate that wording into a couple of places that were still using "zic"
to refer to the database, which is definitely not right (zic is the
compilation tool, not the data).

Back-patch, not because this is very important in itself, but because
we routinely cherry-pick updates to the tznames files and I don't want
to risk future merge failures.
This commit is contained in:
Tom Lane 2016-09-04 19:42:08 -04:00
parent ee78d48853
commit 891ed9317d
10 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/timezone/tznames/Africa.txt
View File

@ -144,7 +144,7 @@ GMT 0 # Greenwich Mean Time
# (Europe/London)
# CONFLICT! SAST is not unique
# Other timezones:
# - SAST South Australian Standard Time (not in zic)
# - SAST South Australian Standard Time (not in IANA database)
SAST 7200 # South Africa Standard Time
# (Africa/Johannesburg)
WAST 7200 D # West Africa Summer Time

12
src/timezone/tznames/America.txt
View File

@ -15,7 +15,7 @@ ACT -18000 # Acre Time
# CONFLICT! ACST is not unique
# Other timezones:
# - ACST: Australian Central Standard Time
ACST -14400 D # Acre Summer Time (obsolete, not in zic)
ACST -14400 D # Acre Summer Time (obsolete, not in IANA database)
ADT -10800 D # Atlantic Daylight Time
# (America/Glace_Bay)
# (America/Goose_Bay)
@ -92,7 +92,7 @@ AST -14400 # Atlantic Standard Time
# (Atlantic/Bermuda)
BOT -14400 # Bolivia Time
# (America/La_Paz)
BRA -10800 # Brazil Time (not in zic)
BRA -10800 # Brazil Time (not in IANA database)
BRST -7200 D # Brasil Summer Time
# (America/Sao_Paulo)
BRT -10800 # Brasil Time
@ -131,7 +131,7 @@ CLST -10800 D # Chile Summer Time
CLT America/Santiago # Chile Time
# (America/Santiago)
# (Antarctica/Palmer)
COT -18000 # Columbia Time (not in zic)
COT -18000 # Columbia Time (not in IANA database)
# CONFLICT! CST is not unique
# Other timezones:
# - CST: Central Standard Time (Australia)
@ -207,7 +207,7 @@ EST -18000 # Eastern Standard Time (America)
# (America/Toronto)
FNT -7200 # Fernando de Noronha Time
# (America/Noronha)
FNST -3600 D # Fernando de Noronha Summer Time (not in zic)
FNST -3600 D # Fernando de Noronha Summer Time (not in IANA database)
# (America/Noronha)
GFT -10800 # French Guiana Time
# (America/Cayenne)
@ -265,7 +265,7 @@ NDT -9000 D # Newfoundland Daylight Time
# CONFLICT! NFT is not unique
# Other timezones:
# - NFT: Norfolk Time (Pacific)
NFT -12600 # Newfoundland Time (not in zic)
NFT -12600 # Newfoundland Time (not in IANA database)
NST -12600 # Newfoundland Standard Time
# (America/St_Johns)
PDT -25200 D # Pacific Daylight Time
@ -274,7 +274,7 @@ PDT -25200 D # Pacific Daylight Time
# (America/Tijuana)
# (America/Vancouver)
# (America/Whitehorse)
PET -18000 # Peru Time (not in zic)
PET -18000 # Peru Time (not in IANA database)
PMDT -7200 D # Pierre & Miquelon Daylight Time
# (America/Miquelon)
PMST -10800 # Pierre & Miquelon Standard Time

12
src/timezone/tznames/Asia.txt
View File

@ -48,10 +48,10 @@ BDT 21600 # Bangladesh Time
# (Asia/Dhaka)
BNT 28800 # Brunei Darussalam Time
# (Asia/Brunei)
BORT 28800 # Borneo Time (Indonesia) (not in zic)
BORT 28800 # Borneo Time (Indonesia) (not in IANA database)
BTT 21600 # Bhutan Time
# (Asia/Thimphu)
CCT 28800 # China Coastal Time (not in zic)
CCT 28800 # China Coastal Time (not in IANA database)
CHOST Asia/Choibalsan # Choibalsan Summer Time
# (Asia/Choibalsan)
CHOT Asia/Choibalsan # Choibalsan Time
@ -123,7 +123,7 @@ GET Asia/Tbilisi # Georgia Time
GST 14400 # Gulf Standard Time
# (Asia/Dubai)
# (Asia/Muscat)
HKT 28800 # Hong Kong Time (not in zic)
HKT 28800 # Hong Kong Time (not in IANA database)
HOVST 28800 D # Hovd Summer Time
# (Asia/Hovd)
HOVT Asia/Hovd # Hovd Time
@ -142,7 +142,7 @@ IRKT Asia/Irkutsk # Irkutsk Time
# (Asia/Irkutsk)
IRST Asia/Tehran # Iran Standard Time
# (Asia/Tehran)
IRT 12600 # Iran Time (not in zic)
IRT 12600 # Iran Time (not in IANA database)
# CONFLICT! IST is not unique
# Other timezones:
# - IST: Irish Summer Time (Europe)
@ -155,10 +155,10 @@ IST 19800 # Indian Standard Time
# - IST: Indian Standard Time (Asia)
IST 7200 # Israel Standard Time
# (Asia/Jerusalem)
JAYT 32400 # Jayapura Time (Indonesia) (not in zic)
JAYT 32400 # Jayapura Time (Indonesia) (not in IANA database)
JST 32400 # Japan Standard Time
# (Asia/Tokyo)
KDT 36000 D # Korean Daylight Time (not in zic)
KDT 36000 D # Korean Daylight Time (not in IANA database)
KGST 21600 D # Kyrgyzstan Summer Time (obsolete)
KGT Asia/Bishkek # Kyrgyzstan Time
# (Asia/Bishkek)

12
src/timezone/tznames/Australia
View File

@ -19,9 +19,9 @@
# in case of a conflict.
@OVERRIDE
CST 34200 # Central Standard Time (not in zic)
EAST 36000 # East Australian Standard Time (not in zic)
EST 36000 # Eastern Standard Time (not in zic)
SAST 34200 # South Australian Standard Time (not in zic)
SAT 34200 # South Australian Standard Time (not in zic)
WST 28800 # Western Standard Time (not in zic)
CST 34200 # Central Standard Time (not in IANA database)
EAST 36000 # East Australian Standard Time (not in IANA database)
EST 36000 # Eastern Standard Time (not in IANA database)
SAST 34200 # South Australian Standard Time (not in IANA database)
SAT 34200 # South Australian Standard Time (not in IANA database)
WST 28800 # Western Standard Time (not in IANA database)

36
src/timezone/tznames/Australia.txt
View File

@ -7,7 +7,7 @@
# src/timezone/tznames/Australia.txt
#
ACSST 37800 D # Central Australia (not in zic)
ACSST 37800 D # Central Australia (not in IANA database)
ACDT 37800 D # Australian Central Daylight Time
# (Australia/Adelaide)
# (Australia/Broken_Hill)
@ -18,7 +18,7 @@ ACST 34200 # Australian Central Standard Time
# (Australia/Darwin)
ACWST 31500 # Australian Central Western Standard Time
# (Australia/Eucla)
AESST 39600 D # Australia Eastern Summer Standard Time (not in zic)
AESST 39600 D # Australia Eastern Summer Standard Time (not in IANA database)
AEDT 39600 D # Australian Eastern Daylight Time
# (Australia/Brisbane)
# (Australia/Currie)
@ -33,42 +33,42 @@ AEST 36000 # Australian Eastern Standard Time
# (Australia/Lindeman)
# (Australia/Melbourne)
# (Australia/Sydney)
AWSST 32400 D # Australia Western Summer Standard Time (not in zic)
AWSST 32400 D # Australia Western Summer Standard Time (not in IANA database)
AWST 28800 # Australian Western Standard Time
# (Australia/Perth)
CADT 37800 D # Central Australia Daylight-Saving Time (not in zic)
CAST 34200 # Central Australia Standard Time (not in zic)
CADT 37800 D # Central Australia Daylight-Saving Time (not in IANA database)
CAST 34200 # Central Australia Standard Time (not in IANA database)
# CONFLICT! CST is not unique
# Other timezones:
# - CST: Central Standard Time (America)
# - CST: China Standard Time (Asia)
# - CST: Cuba Central Standard Time (America)
CST 34200 # Central Standard Time (not in zic)
CWST 31500 # Central Western Standard Time (not in zic)
CST 34200 # Central Standard Time (not in IANA database)
CWST 31500 # Central Western Standard Time (not in IANA database)
# CONFLICT! EAST is not unique
# Other timezones:
# - EAST: Easter Island Time (Chile) (Pacific)
EAST 36000 # East Australian Standard Time (not in zic)
EAST 36000 # East Australian Standard Time (not in IANA database)
# CONFLICT! EST is not unique
# Other timezones:
# - EST: Eastern Standard Time (America)
EST 36000 # Eastern Standard Time (not in zic)
EST 36000 # Eastern Standard Time (not in IANA database)
LHDT Australia/Lord_Howe # Lord Howe Daylight Time
# (Australia/Lord_Howe)
LHST 37800 # Lord Howe Standard Time
# (Australia/Lord_Howe)
LIGT 36000 # Melbourne, Australia (not in zic)
NZT 43200 # New Zealand Time (not in zic)
SADT 37800 D # South Australian Daylight-Saving Time (not in zic)
LIGT 36000 # Melbourne, Australia (not in IANA database)
NZT 43200 # New Zealand Time (not in IANA database)
SADT 37800 D # South Australian Daylight-Saving Time (not in IANA database)
# CONFLICT! SAST is not unique
# Other timezones:
# - SAST South Africa Standard Time
SAST 34200 # South Australian Standard Time (not in zic)
SAT 34200 # South Australian Standard Time (not in zic)
WADT 28800 D # West Australian Daylight-Saving Time (not in zic)
WAST 25200 # West Australian Standard Time (not in zic)
WDT 32400 D # West Australian Daylight-Saving Time (not in zic)
SAST 34200 # South Australian Standard Time (not in IANA database)
SAT 34200 # South Australian Standard Time (not in IANA database)
WADT 28800 D # West Australian Daylight-Saving Time (not in IANA database)
WAST 25200 # West Australian Standard Time (not in IANA database)
WDT 32400 D # West Australian Daylight-Saving Time (not in IANA database)
# CONFLICT! WST is not unique
# Other timezones:
# - WST: West Samoa Time
WST 28800 # Western Standard Time (not in zic)
WST 28800 # Western Standard Time (not in IANA database)

62
src/timezone/tznames/Default
View File

@ -68,7 +68,7 @@ ART America/Argentina/Buenos_Aires # Argentina Time
ARST America/Argentina/Buenos_Aires # Argentina Summer Time
BOT -14400 # Bolivia Time
# (America/La_Paz)
BRA -10800 # Brazil Time (not in zic)
BRA -10800 # Brazil Time (not in IANA database)
BRST -7200 D # Brasil Summer Time
# (America/Sao_Paulo)
BRT -10800 # Brasil Time
@ -79,7 +79,7 @@ BRT -10800 # Brasil Time
# (America/Maceio)
# (America/Recife)
# (America/Sao_Paulo)
COT -18000 # Columbia Time (not in zic)
COT -18000 # Columbia Time (not in IANA database)
# CONFLICT! CDT is not unique
# Other timezones:
# - CDT: Mexico Central Daylight Time (America)
@ -166,7 +166,7 @@ EST -18000 # Eastern Standard Time (America)
# (America/Toronto)
FNT -7200 # Fernando de Noronha Time
# (America/Noronha)
FNST -3600 D # Fernando de Noronha Summer Time (not in zic)
FNST -3600 D # Fernando de Noronha Summer Time (not in IANA database)
# (America/Noronha)
GFT -10800 # French Guiana Time
# (America/Cayenne)
@ -199,7 +199,7 @@ NDT -9000 D # Newfoundland Daylight Time
# (America/St_Johns)
NST -12600 # Newfoundland Standard Time
# (America/St_Johns)
PET -18000 # Peru Time (not in zic)
PET -18000 # Peru Time (not in IANA database)
PDT -25200 D # Pacific Daylight Time
# (America/Dawson)
# (America/Los_Angeles)
@ -269,14 +269,14 @@ BDT 21600 # Bangladesh Time
# (Asia/Dhaka)
BNT 28800 # Brunei Darussalam Time
# (Asia/Brunei)
BORT 28800 # Borneo Time (Indonesia) (not in zic)
BORT 28800 # Borneo Time (Indonesia) (not in IANA database)
BTT 21600 # Bhutan Time
# (Asia/Thimphu)
CCT 28800 # China Coastal Time (not in zic)
CCT 28800 # China Coastal Time (not in IANA database)
GEST Asia/Tbilisi # Georgia Summer Time (obsolete)
GET Asia/Tbilisi # Georgia Time
# (Asia/Tbilisi)
HKT 28800 # Hong Kong Time (not in zic)
HKT 28800 # Hong Kong Time (not in IANA database)
ICT 25200 # Indochina Time
# (Asia/Bangkok)
# (Asia/Phnom_Penh)
@ -287,17 +287,17 @@ IDT 10800 D # Israel Daylight Time
IRKST Asia/Irkutsk # Irkutsk Summer Time (obsolete)
IRKT Asia/Irkutsk # Irkutsk Time
# (Asia/Irkutsk)
IRT 12600 # Iran Time (not in zic)
IRT 12600 # Iran Time (not in IANA database)
# CONFLICT! IST is not unique
# Other timezones:
# - IST: Irish Summer Time (Europe)
# - IST: Indian Standard Time (Asia)
IST 7200 # Israel Standard Time
# (Asia/Jerusalem)
JAYT 32400 # Jayapura Time (Indonesia) (not in zic)
JAYT 32400 # Jayapura Time (Indonesia) (not in IANA database)
JST 32400 # Japan Standard Time
# (Asia/Tokyo)
KDT 36000 D # Korean Daylight Time (not in zic)
KDT 36000 D # Korean Daylight Time (not in IANA database)
KGST 21600 D # Kyrgyzstan Summer Time (obsolete)
KGT Asia/Bishkek # Kyrgyzstan Time
# (Asia/Bishkek)
@ -408,7 +408,7 @@ FKT Atlantic/Stanley # Falkland Islands Time (obsolete)
#################### AUSTRALIA ####################
ACSST 37800 D # Australian Central Summer Standard Time (not in zic)
ACSST 37800 D # Australian Central Summer Standard Time (not in IANA database)
ACDT 37800 D # Australian Central Daylight Time
# (Australia/Adelaide)
# (Australia/Broken_Hill)
@ -419,7 +419,7 @@ ACST 34200 # Australian Central Standard Time
# (Australia/Darwin)
ACWST 31500 # Australian Central Western Standard Time
# (Australia/Eucla)
AESST 39600 D # Australian Eastern Summer Standard Time (not in zic)
AESST 39600 D # Australian Eastern Summer Standard Time (not in IANA database)
AEDT 39600 D # Australian Eastern Daylight Time
# (Australia/Brisbane)
# (Australia/Currie)
@ -434,21 +434,21 @@ AEST 36000 # Australian Eastern Standard Time
# (Australia/Lindeman)
# (Australia/Melbourne)
# (Australia/Sydney)
AWSST 32400 D # Australia Western Summer Standard Time (not in zic)
AWSST 32400 D # Australia Western Summer Standard Time (not in IANA database)
AWST 28800 # Australian Western Standard Time
# (Australia/Perth)
CADT 37800 D # Central Australia Daylight-Saving Time (not in zic)
CAST 34200 # Central Australia Standard Time (not in zic)
CADT 37800 D # Central Australia Daylight-Saving Time (not in IANA database)
CAST 34200 # Central Australia Standard Time (not in IANA database)
LHDT Australia/Lord_Howe # Lord Howe Daylight Time
# (Australia/Lord_Howe)
LHST 37800 # Lord Howe Standard Time
# (Australia/Lord_Howe)
LIGT 36000 # Melbourne, Australia (not in zic)
NZT 43200 # New Zealand Time (not in zic)
SADT 37800 D # South Australian Daylight-Saving Time (not in zic)
WADT 28800 D # West Australian Daylight-Saving Time (not in zic)
WAST 25200 # West Australian Standard Time (not in zic)
WDT 32400 D # West Australian Daylight-Saving Time (not in zic)
LIGT 36000 # Melbourne, Australia (not in IANA database)
NZT 43200 # New Zealand Time (not in IANA database)
SADT 37800 D # South Australian Daylight-Saving Time (not in IANA database)
WADT 28800 D # West Australian Daylight-Saving Time (not in IANA database)
WAST 25200 # West Australian Standard Time (not in IANA database)
WDT 32400 D # West Australian Daylight-Saving Time (not in IANA database)
#################### ETC ####################
@ -472,7 +472,7 @@ GMT 0 # Greenwich Mean Time
# (Europe/London)
UCT 0 # Universal Coordinated Time
# (Etc/UCT)
UT 0 # Universal Time (not in zic)
UT 0 # Universal Time (not in IANA database)
UTC 0 # Coordinated Universal Time
Z 0 # Zulu
ZULU 0 # Zulu
@ -631,10 +631,10 @@ EETDST 10800 D # East-Egypt Summertime
FET 10800 # Further-eastern European Time (obsolete)
# (Europe/Kaliningrad)
# (Europe/Minsk)
MEST 7200 D # Middle Europe Summer Time (not in zic)
MET 3600 # Middle Europe Time (not in zic)
METDST 7200 D # Middle Europe Summer Time (not in zic)
MEZ 3600 # Mitteleuropaeische Zeit (German) (not in zic)
MEST 7200 D # Middle Europe Summer Time (not in IANA database)
MET 3600 # Middle Europe Time (not in IANA database)
METDST 7200 D # Middle Europe Summer Time (not in IANA database)
MEZ 3600 # Mitteleuropaeische Zeit (German) (not in IANA database)
MSD 14400 D # Moscow Daylight Time (obsolete)
MSK Europe/Moscow # Moscow Time
# (Europe/Moscow)
@ -708,11 +708,11 @@ MART -34200 # Marquesas Time
MHT 43200 # Kwajalein Time
# (Pacific/Kwajalein)
# (Pacific/Majuro)
MPT 36000 # North Mariana Islands Time (not in zic)
MPT 36000 # North Mariana Islands Time (not in IANA database)
# CONFLICT! NFT is not unique
# Other timezones:
# - NFT: Norfolk Time (Pacific)
NFT -12600 # Newfoundland Time (not in zic)
NFT -12600 # Newfoundland Time (not in IANA database)
NUT Pacific/Niue # Niue Time
# (Pacific/Niue)
NZDT 46800 D # New Zealand Daylight Time
@ -729,13 +729,13 @@ PONT 39600 # Ponape Time (Micronesia)
# (Pacific/Ponape)
PWT 32400 # Palau Time
# (Pacific/Palau)
TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT")
TAHT -36000 # Tahiti Time (IANA database says "TAHT", other sources "THAT")
# (Pacific/Tahiti)
TKT Pacific/Fakaofo # Tokelau Time
# (Pacific/Fakaofo)
TOT 46800 # Tonga Time
# (Pacific/Tongatapu)
TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK")
TRUT 36000 # Truk Time (IANA database used to say "TRUT", other sources say "TRUK")
# (Pacific/Truk)
TVT 43200 # Tuvalu Time
# (Pacific/Funafuti)
@ -745,4 +745,4 @@ WAKT 43200 # Wake Time
# (Pacific/Wake)
WFT 43200 # Wallis and Futuna Time
# (Pacific/Wallis)
YAPT 36000 # Yap Time (Micronesia) (not in zic)
YAPT 36000 # Yap Time (Micronesia) (not in IANA database)

2
src/timezone/tznames/Etc.txt
View File

@ -27,7 +27,7 @@ GMT 0 # Greenwich Mean Time
# (Europe/London)
UCT 0 # Universal Coordinated Time
# (Etc/UCT)
UT 0 # Universal Time (not in zic)
UT 0 # Universal Time (not in IANA database)
UTC 0 # Coordinated Universal Time
# (Etc/UTC)
Z 0 # Zulu

8
src/timezone/tznames/Europe.txt
View File

@ -182,10 +182,10 @@ GMT 0 # Greenwich Mean Time
# - IST: Israel Standard Time (Asia)
IST 3600 D # Irish Summer Time
# (Europe/Dublin)
MEST 7200 D # Middle Europe Summer Time (not in zic)
MET 3600 # Middle Europe Time (not in zic)
METDST 7200 D # Middle Europe Summer Time (not in zic)
MEZ 3600 # Mitteleuropäische Zeit (German) (not in zic)
MEST 7200 D # Middle Europe Summer Time (not in IANA database)
MET 3600 # Middle Europe Time (not in IANA database)
METDST 7200 D # Middle Europe Summer Time (not in IANA database)
MEZ 3600 # Mitteleuropäische Zeit (German) (not in IANA database)
MSD 14400 D # Moscow Daylight Time (obsolete)
MSK Europe/Moscow # Moscow Time
# (Europe/Moscow)

12
src/timezone/tznames/Pacific.txt
View File

@ -16,7 +16,7 @@ CHADT 49500 D # Chatham Daylight Time (New Zealand)
# (Pacific/Chatham)
CHAST 45900 # Chatham Standard Time (New Zealand)
# (Pacific/Chatham)
ChST 36000 # Chamorro Standard Time (lower case "h" is as in zic)
ChST 36000 # Chamorro Standard Time (lower case "h" is as in IANA database)
# (Pacific/Guam)
# (Pacific/Saipan)
CHUT 36000 # Chuuk Time
@ -52,7 +52,7 @@ MART -34200 # Marquesas Time
MHT 43200 # Kwajalein Time
# (Pacific/Kwajalein)
# (Pacific/Majuro)
MPT 36000 # North Mariana Islands Time (not in zic)
MPT 36000 # North Mariana Islands Time (not in IANA database)
NCT 39600 # New Caledonia Time
# (Pacific/Noumea)
# CONFLICT! NFT is not unique
@ -90,13 +90,13 @@ SBT 39600 # Solomon Islands Time
SST -39600 # South Sumatran Time
# (Pacific/Midway)
# (Pacific/Pago_Pago)
TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT")
TAHT -36000 # Tahiti Time (IANA database says "TAHT", other sources "THAT")
# (Pacific/Tahiti)
TKT Pacific/Fakaofo # Tokelau Time
# (Pacific/Fakaofo)
TOT 46800 # Tonga Time
# (Pacific/Tongatapu)
TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK")
TRUT 36000 # Truk Time (IANA database used to say "TRUT", other sources say "TRUK")
# (Pacific/Truk)
TVT 43200 # Tuvalu Time
# (Pacific/Funafuti)
@ -113,5 +113,5 @@ WSST 46800 # West Samoa Standard Time
# CONFLICT! WST is not unique
# Other timezones:
# - WST: Western Standard Time (Australia)
WST 46800 # West Samoa Time (caution: this used to mean -39600) (not in zic)
YAPT 36000 # Yap Time (Micronesia) (not in zic)
WST 46800 # West Samoa Time (caution: this used to mean -39600) (not in IANA database)
YAPT 36000 # Yap Time (Micronesia) (not in IANA database)

2
src/tools/RELEASE_CHANGES
View File

@ -11,7 +11,7 @@ For All Releases (major, minor, beta, RC)
o run spellchecker on result
o add SGML markup
* Update timezone data to match latest zic database and new
* Update timezone data to match latest IANA timezone database and new
Windows releases, if any (see src/timezone/README)
* Translation updates